From 5b6549cd03b26c2cf300ab85ee6334f4d7389b1d Mon Sep 17 00:00:00 2001 From: Andrea Adami Date: Sun, 20 May 2012 21:37:22 +0000 Subject: 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 Signed-off-by: Koen Kooi --- .../mtd/ubi-utils-klibc/ubiformat.c.patch | 16 +++------------- .../recipes-devtools/mtd/ubi-utils-klibc_1.4.9.bb | 2 +- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'meta-initramfs') 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 7539d76e3..d21ed577b 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 9a8987cb6..f975952b2 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 -- cgit v1.2.3-54-g00ecf