diff options
Diffstat (limited to 'meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc')
2 files changed, 16 insertions, 31 deletions
diff --git a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch index 9d5e4ebf07..6e1b9ff100 100644 --- a/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch +++ b/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch @@ -25,11 +25,11 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com> Makefile | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) -diff --git a/Makefile b/Makefile -index eade234..2275865 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,28 +16,13 @@ endif +Index: git/Makefile +=================================================================== +--- git.orig/Makefile ++++ git/Makefile +@@ -16,28 +16,11 @@ endif TESTS = tests @@ -37,7 +37,7 @@ index eade234..2275865 100644 - ftl_format flash_erase nanddump doc_loadbios \ - ftl_check mkfs.jffs2 flash_lock flash_unlock \ - flash_otp_info flash_otp_dump flash_otp_lock flash_otp_write \ -- mtd_debug flashcp nandwrite nandtest \ +- mtd_debug flashcp nandwrite nandtest mtdpart \ - jffs2dump \ - nftldump nftl_format docfdisk \ - rfddump rfdformat \ @@ -51,15 +51,15 @@ index eade234..2275865 100644 -BINS += mkfs.ubifs/mkfs.ubifs -BINS += $(addprefix ubi-utils/,$(UBI_BINS)) -SCRIPTS = flash_eraseall -+BINS = $(addprefix ubi-utils/,$(UBI_BINS)) - - TARGETS = $(BINS) +- +-TARGETS = $(BINS) -TARGETS += lib/libmtd.a -TARGETS += ubi-utils/libubi.a ++BINS = $(addprefix ubi-utils/,$(UBI_BINS)) OBJDEPS = $(BUILDDIR)/include/version.h -@@ -61,12 +46,9 @@ endif +@@ -61,12 +44,9 @@ endif rm -f $(BUILDDIR)/include/version.h $(MAKE) -C $(TESTS) clean @@ -73,7 +73,7 @@ index eade234..2275865 100644 tests:: $(MAKE) -C $(TESTS) -@@ -91,8 +73,6 @@ LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) +@@ -91,8 +71,6 @@ LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) LDLIBS_jffs2reader = -lz $(LZOLDLIBS) @@ -82,6 +82,3 @@ index eade234..2275865 100644 # # Common libmtd # --- -1.9.1 - 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 - |