diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2012-05-20 21:37:22 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-05-24 12:52:11 +0200 |
| commit | 5b6549cd03b26c2cf300ab85ee6334f4d7389b1d (patch) | |
| tree | c7ec0c4ffa7b8d32db9d805a4e2ff9a2077b1637 | |
| parent | f38bcd610519ba59526fe1248411a138fae452ac (diff) | |
| download | meta-openembedded-contrib-5b6549cd03b26c2cf300ab85ee6334f4d7389b1d.tar.gz | |
ubi-utils-klibc: clean ubiformat patch
* fixes have been committed in klibc for stdio and the additional
* fflush is not necessary anymore (runtime tested pressing CTRL+D)
* bump PR
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
| -rw-r--r-- | meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch | 16 | ||||
| -rw-r--r-- | meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 2 |
2 files changed, 4 insertions, 14 deletions
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch index 7539d76e38..d21ed577b1 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/ubiformat.c.patch @@ -1,25 +1,15 @@ --- a/ubi-utils/ubiformat.c 2012-05-03 01:14:39.000000000 +0200 -+++ b/ubi-utils/ubiformat.c 2012-05-03 01:00:57.000000000 +0200 -@@ -246,7 +246,11 @@ ++++ b/ubi-utils/ubiformat.c 2012-05-20 23:11:57.000000000 +0200 +@@ -246,7 +246,7 @@ while (1) { normsg_cont("continue? (yes/no) "); - if (scanf("%3s", buf) == EOF) { -+ -+ fflush(stderr); -+ fflush(stdout); -+ + if (fgets(buf,4,stdin) == NULL) { sys_errmsg("scanf returned unexpected EOF, assume \"yes\""); return 1; } -@@ -259,10 +263,13 @@ - - static int answer_is_yes(void) - { -+ fflush(stderr); -+ fflush(stdout); -+ +@@ -262,7 +262,7 @@ char buf[4]; while (1) { diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb index 9a8987cb69..f975952b24 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ file://include/common.h;beginline=1;endline=17;md5=ba05b07912a44ea2bf81ce409380049c" -PR = "r2" +PR = "r3" inherit klibc |