diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-10-02 09:06:55 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-10-04 14:53:29 +0000 |
| commit | dec9f0ba38811962fc9486559eb5432c36cf4d9c (patch) | |
| tree | d95c8185813fd4b5a19fe58fd10e79d8d0a1ccd2 /meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch | |
| parent | e222c07ae9b38f77095c76c326f16dc17dcc73c9 (diff) | |
| download | meta-openembedded-dec9f0ba38811962fc9486559eb5432c36cf4d9c.tar.gz | |
ubi-utils-klibc: Update to 1.5.2 release of mtd-utils
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch')
| -rw-r--r-- | meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch index 2e43d5d974..6b09c14d6c 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch @@ -22,20 +22,11 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> include/common.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) -diff --git a/include/common.h b/include/common.h -index 77f3f7d..2cbee0f 100644 ---- a/include/common.h -+++ b/include/common.h -@@ -126,7 +126,7 @@ static char __PRIxoff_t_static_assert[sizeof(off_t) == 8 ? 1 : -1]; - fprintf(stderr, "%s: warning!: " fmt "\n", PROGRAM_NAME, ##__VA_ARGS__); \ - } while(0) - --#if defined(__UCLIBC__) -+#if defined(__UCLIBC__) || defined(__KLIBC__) - /* uClibc versions before 0.9.34 don't have rpmatch() */ - #if __UCLIBC_MAJOR__ == 0 && \ - (__UCLIBC_MINOR__ < 9 || \ -@@ -146,15 +146,17 @@ static inline int __rpmatch(const char *resp) +Index: git/include/common.h +=================================================================== +--- git.orig/include/common.h ++++ git/include/common.h +@@ -161,15 +161,17 @@ static inline int __rpmatch(const char * */ static inline bool prompt(const char *msg, bool def) { @@ -56,6 +47,3 @@ index 77f3f7d..2cbee0f 100644 printf("failed to read prompt; assuming '%s'\n", def ? "yes" : "no"); break; --- -1.9.1 - |