mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-07-26 19:47:17 +00:00
Code Issues Projects Releases Wiki Activity

ubi-utils-klibc: Update to 1.5.2 release of mtd-utils

Browse Source 
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>
This commit is contained in:
Khem Raj
2017-10-02 09:06:55 -07:00
committed by Martin Jansa
parent e222c07ae9
commit dec9f0ba38
3 changed files with 19 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0001-Makefile-only-build-ubi-utils.patch
+11 -14
View File
@@ -25,11 +25,11 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Makefile | 24 ++---------------------- Makefile | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-) 1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/Makefile b/Makefile Index: git/Makefile
index eade234..2275865 100644 ===================================================================
--- a/Makefile --- git.orig/Makefile
+++ b/Makefile +++ git/Makefile
@@ -16,28 +16,13 @@ endif @@ -16,28 +16,11 @@ endif
TESTS = tests TESTS = tests
@@ -37,7 +37,7 @@ index eade234..2275865 100644
- ftl_format flash_erase nanddump doc_loadbios \ - ftl_format flash_erase nanddump doc_loadbios \
- ftl_check mkfs.jffs2 flash_lock flash_unlock \ - ftl_check mkfs.jffs2 flash_lock flash_unlock \
- flash_otp_info flash_otp_dump flash_otp_lock flash_otp_write \ - flash_otp_info flash_otp_dump flash_otp_lock flash_otp_write \
- mtd_debug flashcp nandwrite nandtest \ - mtd_debug flashcp nandwrite nandtest mtdpart \
- jffs2dump \ - jffs2dump \
- nftldump nftl_format docfdisk \ - nftldump nftl_format docfdisk \
- rfddump rfdformat \ - rfddump rfdformat \
@@ -51,15 +51,15 @@ index eade234..2275865 100644
-BINS += mkfs.ubifs/mkfs.ubifs -BINS += mkfs.ubifs/mkfs.ubifs
-BINS += $(addprefix ubi-utils/,$(UBI_BINS)) -BINS += $(addprefix ubi-utils/,$(UBI_BINS))
-SCRIPTS = flash_eraseall -SCRIPTS = flash_eraseall
+BINS = $(addprefix ubi-utils/,$(UBI_BINS)) -
-TARGETS = $(BINS)
TARGETS = $(BINS)
-TARGETS += lib/libmtd.a -TARGETS += lib/libmtd.a
-TARGETS += ubi-utils/libubi.a -TARGETS += ubi-utils/libubi.a
+BINS = $(addprefix ubi-utils/,$(UBI_BINS))
OBJDEPS = $(BUILDDIR)/include/version.h OBJDEPS = $(BUILDDIR)/include/version.h
@@ -61,12 +46,9 @@ endif @@ -61,12 +44,9 @@ endif
rm -f $(BUILDDIR)/include/version.h rm -f $(BUILDDIR)/include/version.h
$(MAKE) -C $(TESTS) clean $(MAKE) -C $(TESTS) clean
@@ -73,7 +73,7 @@ index eade234..2275865 100644
tests:: tests::
$(MAKE) -C $(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) LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
LDLIBS_jffs2reader = -lz $(LZOLDLIBS) LDLIBS_jffs2reader = -lz $(LZOLDLIBS)
@@ -82,6 +82,3 @@ index eade234..2275865 100644
# #
# Common libmtd # Common libmtd
# #
--
1.9.1
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc/0005-common.h-klibc-fixes-2.patch
+5 -17
View File
@@ -22,20 +22,11 @@ Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
include/common.h | 10 ++++++---- include/common.h | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-) 1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/include/common.h b/include/common.h Index: git/include/common.h
index 77f3f7d..2cbee0f 100644 ===================================================================
--- a/include/common.h --- git.orig/include/common.h
+++ b/include/common.h +++ git/include/common.h
@@ -126,7 +126,7 @@ static char __PRIxoff_t_static_assert[sizeof(off_t) == 8 ? 1 : -1]; @@ -161,15 +161,17 @@ static inline int __rpmatch(const char *
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)
*/ */
static inline bool prompt(const char *msg, bool def) 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", printf("failed to read prompt; assuming '%s'\n",
def ? "yes" : "no"); def ? "yes" : "no");
break; break;
--
1.9.1
meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.1.bb → meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc_1.5.2.bb
+3 -5
View File
@@ -9,7 +9,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
inherit klibc inherit klibc
SRC_URI = "git://git.infradead.org/mtd-utils.git;tag=b7455d847ab4f9eeeb6a729efc306bfda7bddc99 \ SRCREV = "aea36417067dade75192bafa03af70b6eb2677b1"
SRC_URI = "git://git.infradead.org/mtd-utils.git \
file://0001-Makefile-only-build-ubi-utils.patch \ file://0001-Makefile-only-build-ubi-utils.patch \
file://0002-common.mk-for-klibc-CC-is-klcc.patch \ file://0002-common.mk-for-klibc-CC-is-klcc.patch \
file://0003-libubi.c-add-klibc-specific-fixes.patch \ file://0003-libubi.c-add-klibc-specific-fixes.patch \
@@ -23,10 +24,7 @@ S = "${WORKDIR}/git/"
EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
do_install () { do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
install -d ${D}${sbindir}
oe_runmake DESTDIR="${D}" install
} }
PACKAGES = "ubi-utils-klibc-dbg" PACKAGES = "ubi-utils-klibc-dbg"