* [ptxdist] [PATCH] Update mtd-utils to 1.4.9 @ 2012-07-23 20:24 Bernhard Walle 2012-07-23 20:28 ` Thomas Petazzoni 0 siblings, 1 reply; 8+ messages in thread From: Bernhard Walle @ 2012-07-23 20:24 UTC (permalink / raw) To: ptxdist Tested on a beagle board. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 23 ------- ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 -------------------- patches/mtd-utils-1.4.9/series | 5 -- .../mtd-utils-1.5.0/0001-make-ubifs-optional.patch | 23 +++++++ ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 ++++++++++++++++++++ patches/mtd-utils-1.5.0/series | 5 ++ rules/mtd-utils.make | 4 +- 7 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch delete mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch delete mode 100644 patches/mtd-utils-1.4.9/series create mode 100644 patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch create mode 100644 patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch create mode 100644 patches/mtd-utils-1.5.0/series diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch deleted file mode 100644 index 2cbce09..0000000 --- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Sun, 11 Mar 2012 20:03:50 +0100 -Subject: [PATCH] make ubifs optional - -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 17a1216..5e1692f 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,9 @@ UBI_BINS = \ - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol - - BINS = $(MTD_BINS) -+ifneq ($(WITHOUT_MKUBIFS), 1) - BINS += mkfs.ubifs/mkfs.ubifs -+endif - BINS += $(addprefix ubi-utils/,$(UBI_BINS)) - SCRIPTS = flash_eraseall - diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch deleted file mode 100644 index eacff21..0000000 --- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Sun, 11 Mar 2012 20:11:14 +0100 -Subject: [PATCH] Make liblzo optional for ubifs tools - -Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. - -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> ---- - Makefile | 2 +- - mkfs.ubifs/compr.c | 17 +++++++++++++++++ - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 000dc86..83eb9ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a) - # - obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ - hashtable/hashtable.o hashtable/hashtable_itr.o --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -+LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid - $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) - - # -diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c -index 4152b6a..244d450 100644 ---- a/mkfs.ubifs/compr.c -+++ b/mkfs.ubifs/compr.c -@@ -24,7 +24,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <string.h> -+#ifndef WITHOUT_LZO - #include <lzo/lzo1x.h> -+#else -+#define LZO1X_999_MEM_COMPRESS 0 -+#endif - #include <linux/types.h> - - #define crc32 __zlib_crc32 -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, - return 0; - } - -+ -+#ifndef WITHOUT_LZO - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) - { -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, - - return 0; - } -+#else -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, -+ size_t *out_len) -+{ -+ (void)in_buf; -+ (void)in_len; -+ (void)out_buf; -+ (void)out_len; -+ return -1; -+} -+#endif - - static int no_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series deleted file mode 100644 index 38ac3d1..0000000 --- a/patches/mtd-utils-1.4.9/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-make-ubifs-optional.patch -0002-Make-liblzo-optional-for-ubifs-tools.patch -# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic diff --git a/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch new file mode 100644 index 0000000..2dec433 --- /dev/null +++ b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch @@ -0,0 +1,23 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:03:50 +0100 +Subject: [PATCH] make ubifs optional + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index f380b42..a682a8f 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,9 @@ UBI_BINS = \ + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol + + BINS = $(MTD_BINS) ++ifneq ($(WITHOUT_MKUBIFS), 1) + BINS += mkfs.ubifs/mkfs.ubifs ++endif + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) + SCRIPTS = flash_eraseall + diff --git a/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch new file mode 100644 index 0000000..01c3656 --- /dev/null +++ b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch @@ -0,0 +1,68 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:11:14 +0100 +Subject: [PATCH] Make liblzo optional for ubifs tools + +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 2 +- + mkfs.ubifs/compr.c | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a682a8f..190db58 100644 +--- a/Makefile ++++ b/Makefile +@@ -105,7 +105,7 @@ $(call _mkdep,lib/,libmtd.a) + # + obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ + hashtable/hashtable.o hashtable/hashtable_itr.o +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid ++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) + + # +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c +index 4152b6a..244d450 100644 +--- a/mkfs.ubifs/compr.c ++++ b/mkfs.ubifs/compr.c +@@ -24,7 +24,11 @@ + #include <stdio.h> + #include <stdint.h> + #include <string.h> ++#ifndef WITHOUT_LZO + #include <lzo/lzo1x.h> ++#else ++#define LZO1X_999_MEM_COMPRESS 0 ++#endif + #include <linux/types.h> + + #define crc32 __zlib_crc32 +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, + return 0; + } + ++ ++#ifndef WITHOUT_LZO + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) + { +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + + return 0; + } ++#else ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++{ ++ (void)in_buf; ++ (void)in_len; ++ (void)out_buf; ++ (void)out_len; ++ return -1; ++} ++#endif + + static int no_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) diff --git a/patches/mtd-utils-1.5.0/series b/patches/mtd-utils-1.5.0/series new file mode 100644 index 0000000..38ac3d1 --- /dev/null +++ b/patches/mtd-utils-1.5.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-ubifs-optional.patch +0002-Make-liblzo-optional-for-ubifs-tools.patch +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 9fa4e5a..d20050e 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 1.4.9 -MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b +MTD_UTILS_VERSION := 1.5.0 +MTD_UTILS_MD5 := 7332f1143be4ba8ee2de3096cbd3b03b MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9 2012-07-23 20:24 [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle @ 2012-07-23 20:28 ` Thomas Petazzoni 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.5.0 Bernhard Walle 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle 0 siblings, 2 replies; 8+ messages in thread From: Thomas Petazzoni @ 2012-07-23 20:28 UTC (permalink / raw) To: ptxdist; +Cc: bernhard Le Mon, 23 Jul 2012 22:24:17 +0200, Bernhard Walle <bernhard@bwalle.de> a écrit : > -MTD_UTILS_VERSION := 1.4.9 > -MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b > +MTD_UTILS_VERSION := 1.5.0 > +MTD_UTILS_MD5 := 7332f1143be4ba8ee2de3096cbd3b03b I guess the title of the patch is "Update mtd-utils to 1.5.0", no? :-) Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH] Update mtd-utils to 1.5.0 2012-07-23 20:28 ` Thomas Petazzoni @ 2012-07-23 20:30 ` Bernhard Walle 2012-07-24 19:56 ` Michael Olbrich 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle 1 sibling, 1 reply; 8+ messages in thread From: Bernhard Walle @ 2012-07-23 20:30 UTC (permalink / raw) To: ptxdist Tested on a beagle board. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 23 ------- ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 -------------------- patches/mtd-utils-1.4.9/series | 5 -- .../mtd-utils-1.5.0/0001-make-ubifs-optional.patch | 23 +++++++ ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 ++++++++++++++++++++ patches/mtd-utils-1.5.0/series | 5 ++ rules/mtd-utils.make | 4 +- 7 files changed, 98 insertions(+), 98 deletions(-) delete mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch delete mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch delete mode 100644 patches/mtd-utils-1.4.9/series create mode 100644 patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch create mode 100644 patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch create mode 100644 patches/mtd-utils-1.5.0/series diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch deleted file mode 100644 index 2cbce09..0000000 --- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Sun, 11 Mar 2012 20:03:50 +0100 -Subject: [PATCH] make ubifs optional - -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> ---- - Makefile | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile b/Makefile -index 17a1216..5e1692f 100644 ---- a/Makefile -+++ b/Makefile -@@ -30,7 +30,9 @@ UBI_BINS = \ - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol - - BINS = $(MTD_BINS) -+ifneq ($(WITHOUT_MKUBIFS), 1) - BINS += mkfs.ubifs/mkfs.ubifs -+endif - BINS += $(addprefix ubi-utils/,$(UBI_BINS)) - SCRIPTS = flash_eraseall - diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch deleted file mode 100644 index eacff21..0000000 --- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch +++ /dev/null @@ -1,68 +0,0 @@ -From: Bernhard Walle <bernhard@bwalle.de> -Date: Sun, 11 Mar 2012 20:11:14 +0100 -Subject: [PATCH] Make liblzo optional for ubifs tools - -Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. - -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> ---- - Makefile | 2 +- - mkfs.ubifs/compr.c | 17 +++++++++++++++++ - 2 files changed, 18 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 000dc86..83eb9ce 100644 ---- a/Makefile -+++ b/Makefile -@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a) - # - obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ - hashtable/hashtable.o hashtable/hashtable_itr.o --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -+LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid - $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) - - # -diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c -index 4152b6a..244d450 100644 ---- a/mkfs.ubifs/compr.c -+++ b/mkfs.ubifs/compr.c -@@ -24,7 +24,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <string.h> -+#ifndef WITHOUT_LZO - #include <lzo/lzo1x.h> -+#else -+#define LZO1X_999_MEM_COMPRESS 0 -+#endif - #include <linux/types.h> - - #define crc32 __zlib_crc32 -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, - return 0; - } - -+ -+#ifndef WITHOUT_LZO - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) - { -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, - - return 0; - } -+#else -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, -+ size_t *out_len) -+{ -+ (void)in_buf; -+ (void)in_len; -+ (void)out_buf; -+ (void)out_len; -+ return -1; -+} -+#endif - - static int no_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series deleted file mode 100644 index 38ac3d1..0000000 --- a/patches/mtd-utils-1.4.9/series +++ /dev/null @@ -1,5 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-make-ubifs-optional.patch -0002-Make-liblzo-optional-for-ubifs-tools.patch -# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic diff --git a/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch new file mode 100644 index 0000000..2dec433 --- /dev/null +++ b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch @@ -0,0 +1,23 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:03:50 +0100 +Subject: [PATCH] make ubifs optional + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index f380b42..a682a8f 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,9 @@ UBI_BINS = \ + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol + + BINS = $(MTD_BINS) ++ifneq ($(WITHOUT_MKUBIFS), 1) + BINS += mkfs.ubifs/mkfs.ubifs ++endif + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) + SCRIPTS = flash_eraseall + diff --git a/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch new file mode 100644 index 0000000..01c3656 --- /dev/null +++ b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch @@ -0,0 +1,68 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:11:14 +0100 +Subject: [PATCH] Make liblzo optional for ubifs tools + +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 2 +- + mkfs.ubifs/compr.c | 17 +++++++++++++++++ + 2 files changed, 18 insertions(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index a682a8f..190db58 100644 +--- a/Makefile ++++ b/Makefile +@@ -105,7 +105,7 @@ $(call _mkdep,lib/,libmtd.a) + # + obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ + hashtable/hashtable.o hashtable/hashtable_itr.o +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid ++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) + + # +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c +index 4152b6a..244d450 100644 +--- a/mkfs.ubifs/compr.c ++++ b/mkfs.ubifs/compr.c +@@ -24,7 +24,11 @@ + #include <stdio.h> + #include <stdint.h> + #include <string.h> ++#ifndef WITHOUT_LZO + #include <lzo/lzo1x.h> ++#else ++#define LZO1X_999_MEM_COMPRESS 0 ++#endif + #include <linux/types.h> + + #define crc32 __zlib_crc32 +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, + return 0; + } + ++ ++#ifndef WITHOUT_LZO + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) + { +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + + return 0; + } ++#else ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++{ ++ (void)in_buf; ++ (void)in_len; ++ (void)out_buf; ++ (void)out_len; ++ return -1; ++} ++#endif + + static int no_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) diff --git a/patches/mtd-utils-1.5.0/series b/patches/mtd-utils-1.5.0/series new file mode 100644 index 0000000..38ac3d1 --- /dev/null +++ b/patches/mtd-utils-1.5.0/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-ubifs-optional.patch +0002-Make-liblzo-optional-for-ubifs-tools.patch +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index 9fa4e5a..d20050e 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 1.4.9 -MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b +MTD_UTILS_VERSION := 1.5.0 +MTD_UTILS_MD5 := 7332f1143be4ba8ee2de3096cbd3b03b MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) -- 1.7.9.5 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] Update mtd-utils to 1.5.0 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.5.0 Bernhard Walle @ 2012-07-24 19:56 ` Michael Olbrich 0 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2012-07-24 19:56 UTC (permalink / raw) To: ptxdist On Mon, Jul 23, 2012 at 10:30:11PM +0200, Bernhard Walle wrote: > Tested on a beagle board. > Thanks, applied. Michael > Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > --- > .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 23 ------- > ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 -------------------- > patches/mtd-utils-1.4.9/series | 5 -- > .../mtd-utils-1.5.0/0001-make-ubifs-optional.patch | 23 +++++++ > ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 ++++++++++++++++++++ > patches/mtd-utils-1.5.0/series | 5 ++ > rules/mtd-utils.make | 4 +- > 7 files changed, 98 insertions(+), 98 deletions(-) > delete mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > delete mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > delete mode 100644 patches/mtd-utils-1.4.9/series > create mode 100644 patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch > create mode 100644 patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch > create mode 100644 patches/mtd-utils-1.5.0/series > > diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > deleted file mode 100644 > index 2cbce09..0000000 > --- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -From: Bernhard Walle <bernhard@bwalle.de> > -Date: Sun, 11 Mar 2012 20:03:50 +0100 > -Subject: [PATCH] make ubifs optional > - > -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > ---- > - Makefile | 2 ++ > - 1 file changed, 2 insertions(+) > - > -diff --git a/Makefile b/Makefile > -index 17a1216..5e1692f 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -30,7 +30,9 @@ UBI_BINS = \ > - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol > - > - BINS = $(MTD_BINS) > -+ifneq ($(WITHOUT_MKUBIFS), 1) > - BINS += mkfs.ubifs/mkfs.ubifs > -+endif > - BINS += $(addprefix ubi-utils/,$(UBI_BINS)) > - SCRIPTS = flash_eraseall > - > diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > deleted file mode 100644 > index eacff21..0000000 > --- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > +++ /dev/null > @@ -1,68 +0,0 @@ > -From: Bernhard Walle <bernhard@bwalle.de> > -Date: Sun, 11 Mar 2012 20:11:14 +0100 > -Subject: [PATCH] Make liblzo optional for ubifs tools > - > -Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. > - > -Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > ---- > - Makefile | 2 +- > - mkfs.ubifs/compr.c | 17 +++++++++++++++++ > - 2 files changed, 18 insertions(+), 1 deletion(-) > - > -diff --git a/Makefile b/Makefile > -index 000dc86..83eb9ce 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a) > - # > - obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ > - hashtable/hashtable.o hashtable/hashtable_itr.o > --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid > -+LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid > - $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) > - > - # > -diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c > -index 4152b6a..244d450 100644 > ---- a/mkfs.ubifs/compr.c > -+++ b/mkfs.ubifs/compr.c > -@@ -24,7 +24,11 @@ > - #include <stdio.h> > - #include <stdint.h> > - #include <string.h> > -+#ifndef WITHOUT_LZO > - #include <lzo/lzo1x.h> > -+#else > -+#define LZO1X_999_MEM_COMPRESS 0 > -+#endif > - #include <linux/types.h> > - > - #define crc32 __zlib_crc32 > -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, > - return 0; > - } > - > -+ > -+#ifndef WITHOUT_LZO > - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > - size_t *out_len) > - { > -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > - > - return 0; > - } > -+#else > -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > -+ size_t *out_len) > -+{ > -+ (void)in_buf; > -+ (void)in_len; > -+ (void)out_buf; > -+ (void)out_len; > -+ return -1; > -+} > -+#endif > - > - static int no_compress(void *in_buf, size_t in_len, void *out_buf, > - size_t *out_len) > diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series > deleted file mode 100644 > index 38ac3d1..0000000 > --- a/patches/mtd-utils-1.4.9/series > +++ /dev/null > @@ -1,5 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-make-ubifs-optional.patch > -0002-Make-liblzo-optional-for-ubifs-tools.patch > -# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic > diff --git a/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch > new file mode 100644 > index 0000000..2dec433 > --- /dev/null > +++ b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch > @@ -0,0 +1,23 @@ > +From: Bernhard Walle <bernhard@bwalle.de> > +Date: Sun, 11 Mar 2012 20:03:50 +0100 > +Subject: [PATCH] make ubifs optional > + > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > +--- > + Makefile | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/Makefile b/Makefile > +index f380b42..a682a8f 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -30,7 +30,9 @@ UBI_BINS = \ > + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol > + > + BINS = $(MTD_BINS) > ++ifneq ($(WITHOUT_MKUBIFS), 1) > + BINS += mkfs.ubifs/mkfs.ubifs > ++endif > + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) > + SCRIPTS = flash_eraseall > + > diff --git a/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch > new file mode 100644 > index 0000000..01c3656 > --- /dev/null > +++ b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch > @@ -0,0 +1,68 @@ > +From: Bernhard Walle <bernhard@bwalle.de> > +Date: Sun, 11 Mar 2012 20:11:14 +0100 > +Subject: [PATCH] Make liblzo optional for ubifs tools > + > +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. > + > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > +--- > + Makefile | 2 +- > + mkfs.ubifs/compr.c | 17 +++++++++++++++++ > + 2 files changed, 18 insertions(+), 1 deletion(-) > + > +diff --git a/Makefile b/Makefile > +index a682a8f..190db58 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -105,7 +105,7 @@ $(call _mkdep,lib/,libmtd.a) > + # > + obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ > + hashtable/hashtable.o hashtable/hashtable_itr.o > +-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid > ++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid > + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) > + > + # > +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c > +index 4152b6a..244d450 100644 > +--- a/mkfs.ubifs/compr.c > ++++ b/mkfs.ubifs/compr.c > +@@ -24,7 +24,11 @@ > + #include <stdio.h> > + #include <stdint.h> > + #include <string.h> > ++#ifndef WITHOUT_LZO > + #include <lzo/lzo1x.h> > ++#else > ++#define LZO1X_999_MEM_COMPRESS 0 > ++#endif > + #include <linux/types.h> > + > + #define crc32 __zlib_crc32 > +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, > + return 0; > + } > + > ++ > ++#ifndef WITHOUT_LZO > + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > + size_t *out_len) > + { > +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > + > + return 0; > + } > ++#else > ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > ++ size_t *out_len) > ++{ > ++ (void)in_buf; > ++ (void)in_len; > ++ (void)out_buf; > ++ (void)out_len; > ++ return -1; > ++} > ++#endif > + > + static int no_compress(void *in_buf, size_t in_len, void *out_buf, > + size_t *out_len) > diff --git a/patches/mtd-utils-1.5.0/series b/patches/mtd-utils-1.5.0/series > new file mode 100644 > index 0000000..38ac3d1 > --- /dev/null > +++ b/patches/mtd-utils-1.5.0/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-make-ubifs-optional.patch > +0002-Make-liblzo-optional-for-ubifs-tools.patch > +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > index 9fa4e5a..d20050e 100644 > --- a/rules/mtd-utils.make > +++ b/rules/mtd-utils.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils > # > # Paths and names > # > -MTD_UTILS_VERSION := 1.4.9 > -MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b > +MTD_UTILS_VERSION := 1.5.0 > +MTD_UTILS_MD5 := 7332f1143be4ba8ee2de3096cbd3b03b > MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) > MTD_UTILS_SUFFIX := tar.bz2 > MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) > -- > 1.7.9.5 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9 2012-07-23 20:28 ` Thomas Petazzoni 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.5.0 Bernhard Walle @ 2012-07-23 20:30 ` Bernhard Walle 1 sibling, 0 replies; 8+ messages in thread From: Bernhard Walle @ 2012-07-23 20:30 UTC (permalink / raw) To: ptxdist Am 23.07.12 22:28, schrieb Thomas Petazzoni: > > I guess the title of the patch is "Update mtd-utils to 1.5.0", no? :-) Of course, just a copy and paste error. Thanks for spotting that! Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 @ 2012-03-13 12:02 Bernhard Walle 2012-03-13 12:00 ` [ptxdist] [PATCH] " bernhard 0 siblings, 1 reply; 8+ messages in thread From: Bernhard Walle @ 2012-03-13 12:02 UTC (permalink / raw) To: ptxdist * Michael Olbrich <m.olbrich@pengutronix.de> [2012-03-13 10:09]: > > > > flash-info has been dropped in favour to mtdinfo. > > An option for mtdinfo already exists. Indeed, I missed that. But it's in the ubi directory, so I adjusted the dependencies in Kconfig. > > +++ b/patches/mtd-utils-1.4.9/0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch > > @@ -0,0 +1,24 @@ > > +From: Bernhard Walle <bernhard@bwalle.de> > > +Date: Sun, 11 Mar 2012 18:38:20 +0100 > > +Subject: [PATCH] Makefile: Use LZOLDFLAGS when building mkfs.ubifs > > + > > +The LZOLDFLAGS variable is used by jffs2 but not by mkfs.ubifs. > > Please elaborate why this is needed. Indeed, that's for upstream. It's not needed as ptxdist patch. New patch will follow. Regards, Bernhard -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* [ptxdist] [PATCH] Update mtd-utils to 1.4.9 2012-03-13 12:02 [ptxdist] [PATCH 1/3] " Bernhard Walle @ 2012-03-13 12:00 ` bernhard 2012-03-13 13:31 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: bernhard @ 2012-03-13 12:00 UTC (permalink / raw) To: ptxdist; +Cc: Bernhard Walle From: Bernhard Walle <bernhard@bwalle.de> I had to rework some patches. Parallel build has been fixed upstream due in commits 5b1cfb9d09a8a40577e79262c6d79dfcde36b1b7 and 05f56bf49ee0de8979c29c11f61a01e30e964444, so we should be able to enable it here. flash-info has been dropped and mtdinfo should be used instead. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- .../0001-make-liblzo-optional.patch | 107 -------------------- .../0002-make-mkubifs-optional.patch | 26 ----- patches/mtd-utils-1.4.6/series | 2 - .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 24 +++++ ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 54 ++++++++++ patches/mtd-utils-1.4.9/series | 5 + rules/host-mtd-utils.make | 2 - rules/mtd-utils.in | 10 +- rules/mtd-utils.make | 9 +- 9 files changed, 87 insertions(+), 152 deletions(-) delete mode 100644 patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch delete mode 100644 patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch delete mode 100644 patches/mtd-utils-1.4.6/series create mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch create mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch create mode 100644 patches/mtd-utils-1.4.9/series diff --git a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch b/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch deleted file mode 100644 index 00845a1..0000000 --- a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch +++ /dev/null @@ -1,107 +0,0 @@ -From: Marc Kleine-Budde <mkl@pengutronix.de> -Date: Mon, 20 Jul 2009 19:37:09 +0200 -Subject: [PATCH] make liblzo optional - -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> ---- - Makefile | 3 ++- - compr.h | 2 ++ - mkfs.ubifs/Makefile | 6 +++++- - mkfs.ubifs/compr.c | 17 +++++++++++++++++ - 4 files changed, 26 insertions(+), 2 deletions(-) - -Index: mtd-utils-1.4.6/Makefile -=================================================================== ---- mtd-utils-1.4.6.orig/Makefile -+++ mtd-utils-1.4.6/Makefile -@@ -10,6 +10,7 @@ ifeq ($(WITHOUT_LZO), 1) - CPPFLAGS += -DWITHOUT_LZO - else - LZOLDLIBS = -llzo2 -+ JFFS2_COMPR_LZO_O := compr_lzo.o - endif - - SUBDIRS = lib ubi-utils mkfs.ubifs -@@ -50,7 +51,7 @@ $(SYMLINKS): - ln -sf ../fs/jffs2/$@ $@ - - $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ -- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ -+ compr_rtime.o mkfs.jffs2.o compr_zlib.o $(JFFS2_COMPR_LZO_O) \ - compr.o rbtree.o) - LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) - LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) -Index: mtd-utils-1.4.6/compr.h -=================================================================== ---- mtd-utils-1.4.6.orig/compr.h -+++ mtd-utils-1.4.6/compr.h -@@ -18,7 +18,9 @@ - - #define CONFIG_JFFS2_ZLIB - #define CONFIG_JFFS2_RTIME -+#ifndef WITHOUT_LZO - #define CONFIG_JFFS2_LZO -+#endif - - #define JFFS2_RUBINMIPS_PRIORITY 10 - #define JFFS2_DYNRUBIN_PRIORITY 20 -Index: mtd-utils-1.4.6/mkfs.ubifs/Makefile -=================================================================== ---- mtd-utils-1.4.6.orig/mkfs.ubifs/Makefile -+++ mtd-utils-1.4.6/mkfs.ubifs/Makefile -@@ -6,7 +6,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] - - TARGETS = mkfs.ubifs - --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi -+ifneq ($(WITHOUT_LZO), 1) -+mkfs.ubifs_LIBLZO = -llzo2 -+endif -+ -+LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi - LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd - LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) - -Index: mtd-utils-1.4.6/mkfs.ubifs/compr.c -=================================================================== ---- mtd-utils-1.4.6.orig/mkfs.ubifs/compr.c -+++ mtd-utils-1.4.6/mkfs.ubifs/compr.c -@@ -24,7 +24,11 @@ - #include <stdio.h> - #include <stdint.h> - #include <string.h> -+#ifndef WITHOUT_LZO - #include <lzo/lzo1x.h> -+#else -+#define LZO1X_999_MEM_COMPRESS 0 -+#endif - #include <linux/types.h> - - #define crc32 __zlib_crc32 -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, si - return 0; - } - -+ -+#ifndef WITHOUT_LZO - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) - { -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, si - - return 0; - } -+#else -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, -+ size_t *out_len) -+{ -+ (void)in_buf; -+ (void)in_len; -+ (void)out_buf; -+ (void)out_len; -+ return -1; -+} -+#endif - - static int no_compress(void *in_buf, size_t in_len, void *out_buf, - size_t *out_len) diff --git a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch b/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch deleted file mode 100644 index 23d0111..0000000 --- a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Ladislav Michl <ladis@linux-mips.org> -Date: Tue, 3 Aug 2010 13:00:00 +0200 -Subject: [PATCH] make mkubifs optional - -Signed-off-by: Ladislav Michl <ladis@linux-mips.org> ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -Index: mtd-utils-1.4.6/Makefile -=================================================================== ---- mtd-utils-1.4.6.orig/Makefile -+++ mtd-utils-1.4.6/Makefile -@@ -13,7 +13,11 @@ else - JFFS2_COMPR_LZO_O := compr_lzo.o - endif - --SUBDIRS = lib ubi-utils mkfs.ubifs -+SUBDIRS = lib ubi-utils -+ifneq ($(WITHOUT_MKUBIFS), 1) -+ SUBDIRS += mkfs.ubifs -+endif -+ - TESTS = tests - - TARGETS = ftl_format flash_erase nanddump doc_loadbios \ diff --git a/patches/mtd-utils-1.4.6/series b/patches/mtd-utils-1.4.6/series deleted file mode 100644 index 4888771..0000000 --- a/patches/mtd-utils-1.4.6/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-make-liblzo-optional.patch -0002-make-mkubifs-optional.patch diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch new file mode 100644 index 0000000..01c4139 --- /dev/null +++ b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch @@ -0,0 +1,24 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:03:50 +0100 +Subject: [PATCH] make ubifs optional + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 17a1216..000dc86 100644 +--- a/Makefile ++++ b/Makefile +@@ -30,8 +30,10 @@ UBI_BINS = \ + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol + + BINS = $(MTD_BINS) ++ifneq ($(WITHOUT_MKUBIFS), 1) + BINS += mkfs.ubifs/mkfs.ubifs + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) ++endif + SCRIPTS = flash_eraseall + + TARGETS = $(BINS) diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch new file mode 100644 index 0000000..7e008de --- /dev/null +++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch @@ -0,0 +1,54 @@ +From: Bernhard Walle <bernhard@bwalle.de> +Date: Sun, 11 Mar 2012 20:11:14 +0100 +Subject: [PATCH] Make liblzo optional for ubifs tools + +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. + +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> +--- + mkfs.ubifs/compr.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c +index 4152b6a..244d450 100644 +--- a/mkfs.ubifs/compr.c ++++ b/mkfs.ubifs/compr.c +@@ -24,7 +24,11 @@ + #include <stdio.h> + #include <stdint.h> + #include <string.h> ++#ifndef WITHOUT_LZO + #include <lzo/lzo1x.h> ++#else ++#define LZO1X_999_MEM_COMPRESS 0 ++#endif + #include <linux/types.h> + + #define crc32 __zlib_crc32 +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, + return 0; + } + ++ ++#ifndef WITHOUT_LZO + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) + { +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, + + return 0; + } ++#else ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, ++ size_t *out_len) ++{ ++ (void)in_buf; ++ (void)in_len; ++ (void)out_buf; ++ (void)out_len; ++ return -1; ++} ++#endif + + static int no_compress(void *in_buf, size_t in_len, void *out_buf, + size_t *out_len) diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series new file mode 100644 index 0000000..38ac3d1 --- /dev/null +++ b/patches/mtd-utils-1.4.9/series @@ -0,0 +1,5 @@ +# generated by git-ptx-patches +#tag:base --start-number 1 +0001-make-ubifs-optional.patch +0002-Make-liblzo-optional-for-ubifs-tools.patch +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make index ddba9b8..64a0468 100644 --- a/rules/host-mtd-utils.make +++ b/rules/host-mtd-utils.make @@ -33,6 +33,4 @@ HOST_MTD_UTILS_MAKEVARS = \ BUILDDIR=$(HOST_MTD_UTILS_DIR) \ DESTDIR=$(HOST_MTD_UTILS_PKGDIR) -HOST_MTD_UTILS_MAKE_PAR := NO - # vim: syntax=make diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in index 800202b..50a489e 100644 --- a/rules/mtd-utils.in +++ b/rules/mtd-utils.in @@ -50,12 +50,6 @@ config MTD_UTILS_FLASH_ERASEALL comment "flash_eraseall is disabled by busybox flash_eraseall" depends on BUSYBOX_FLASH_ERASEALL -config MTD_UTILS_FLASH_INFO - bool - prompt "flash_info" - help - print info about a MTD device - config MTD_UTILS_FLASH_LOCK bool prompt "flash_lock" @@ -308,8 +302,6 @@ config MTD_UTILS_MKFS_UBIFS help Create ubifs filesystems -endif - config MTD_UTILS_MTDINFO bool prompt "mtdinfo" @@ -317,3 +309,5 @@ config MTD_UTILS_MTDINFO Print UBI specific information about mtd devices endif + +endif diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make index b52a170..14df787 100644 --- a/rules/mtd-utils.make +++ b/rules/mtd-utils.make @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils # # Paths and names # -MTD_UTILS_VERSION := 1.4.6 -MTD_UTILS_MD5 := a0418afcf6026824a5fa5e9051793f3c +MTD_UTILS_VERSION := 1.4.9 +MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) MTD_UTILS_SUFFIX := tar.bz2 MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) @@ -53,7 +53,6 @@ MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1 endif MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR) -MTD_UTILS_MAKE_PAR := NO $(STATEDIR)/mtd-utils.prepare: @$(call targetinfo) @@ -88,10 +87,6 @@ ifdef PTXCONF_MTD_UTILS_FLASH_ERASEALL @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/flash_eraseall) endif -ifdef PTXCONF_MTD_UTILS_FLASH_INFO - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ - /usr/sbin/flash_info) -endif ifdef PTXCONF_MTD_UTILS_FLASH_LOCK @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ /usr/sbin/flash_lock) -- 1.7.9.4 -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9 2012-03-13 12:00 ` [ptxdist] [PATCH] " bernhard @ 2012-03-13 13:31 ` Michael Olbrich 2012-03-13 13:34 ` Michael Olbrich 0 siblings, 1 reply; 8+ messages in thread From: Michael Olbrich @ 2012-03-13 13:31 UTC (permalink / raw) To: ptxdist On Tue, Mar 13, 2012 at 01:00:11PM +0100, bernhard@bwalle.de wrote: > From: Bernhard Walle <bernhard@bwalle.de> > > I had to rework some patches. Parallel build has been fixed upstream due > in commits 5b1cfb9d09a8a40577e79262c6d79dfcde36b1b7 and > 05f56bf49ee0de8979c29c11f61a01e30e964444, so we should be able to enable > it here. > > flash-info has been dropped and mtdinfo should be used instead. This patch does not apply. The last one did. Maybe you have some other local changes? Michael > Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > --- > .../0001-make-liblzo-optional.patch | 107 -------------------- > .../0002-make-mkubifs-optional.patch | 26 ----- > patches/mtd-utils-1.4.6/series | 2 - > .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 24 +++++ > ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 54 ++++++++++ > patches/mtd-utils-1.4.9/series | 5 + > rules/host-mtd-utils.make | 2 - > rules/mtd-utils.in | 10 +- > rules/mtd-utils.make | 9 +- > 9 files changed, 87 insertions(+), 152 deletions(-) > delete mode 100644 patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > delete mode 100644 patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > delete mode 100644 patches/mtd-utils-1.4.6/series > create mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > create mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > create mode 100644 patches/mtd-utils-1.4.9/series > > diff --git a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch b/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > deleted file mode 100644 > index 00845a1..0000000 > --- a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > +++ /dev/null > @@ -1,107 +0,0 @@ > -From: Marc Kleine-Budde <mkl@pengutronix.de> > -Date: Mon, 20 Jul 2009 19:37:09 +0200 > -Subject: [PATCH] make liblzo optional > - > -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > ---- > - Makefile | 3 ++- > - compr.h | 2 ++ > - mkfs.ubifs/Makefile | 6 +++++- > - mkfs.ubifs/compr.c | 17 +++++++++++++++++ > - 4 files changed, 26 insertions(+), 2 deletions(-) > - > -Index: mtd-utils-1.4.6/Makefile > -=================================================================== > ---- mtd-utils-1.4.6.orig/Makefile > -+++ mtd-utils-1.4.6/Makefile > -@@ -10,6 +10,7 @@ ifeq ($(WITHOUT_LZO), 1) > - CPPFLAGS += -DWITHOUT_LZO > - else > - LZOLDLIBS = -llzo2 > -+ JFFS2_COMPR_LZO_O := compr_lzo.o > - endif > - > - SUBDIRS = lib ubi-utils mkfs.ubifs > -@@ -50,7 +51,7 @@ $(SYMLINKS): > - ln -sf ../fs/jffs2/$@ $@ > - > - $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ > -- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ > -+ compr_rtime.o mkfs.jffs2.o compr_zlib.o $(JFFS2_COMPR_LZO_O) \ > - compr.o rbtree.o) > - LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) > - LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) > -Index: mtd-utils-1.4.6/compr.h > -=================================================================== > ---- mtd-utils-1.4.6.orig/compr.h > -+++ mtd-utils-1.4.6/compr.h > -@@ -18,7 +18,9 @@ > - > - #define CONFIG_JFFS2_ZLIB > - #define CONFIG_JFFS2_RTIME > -+#ifndef WITHOUT_LZO > - #define CONFIG_JFFS2_LZO > -+#endif > - > - #define JFFS2_RUBINMIPS_PRIORITY 10 > - #define JFFS2_DYNRUBIN_PRIORITY 20 > -Index: mtd-utils-1.4.6/mkfs.ubifs/Makefile > -=================================================================== > ---- mtd-utils-1.4.6.orig/mkfs.ubifs/Makefile > -+++ mtd-utils-1.4.6/mkfs.ubifs/Makefile > -@@ -6,7 +6,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] > - > - TARGETS = mkfs.ubifs > - > --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi > -+ifneq ($(WITHOUT_LZO), 1) > -+mkfs.ubifs_LIBLZO = -llzo2 > -+endif > -+ > -+LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi > - LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd > - LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) > - > -Index: mtd-utils-1.4.6/mkfs.ubifs/compr.c > -=================================================================== > ---- mtd-utils-1.4.6.orig/mkfs.ubifs/compr.c > -+++ mtd-utils-1.4.6/mkfs.ubifs/compr.c > -@@ -24,7 +24,11 @@ > - #include <stdio.h> > - #include <stdint.h> > - #include <string.h> > -+#ifndef WITHOUT_LZO > - #include <lzo/lzo1x.h> > -+#else > -+#define LZO1X_999_MEM_COMPRESS 0 > -+#endif > - #include <linux/types.h> > - > - #define crc32 __zlib_crc32 > -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, si > - return 0; > - } > - > -+ > -+#ifndef WITHOUT_LZO > - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > - size_t *out_len) > - { > -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, si > - > - return 0; > - } > -+#else > -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > -+ size_t *out_len) > -+{ > -+ (void)in_buf; > -+ (void)in_len; > -+ (void)out_buf; > -+ (void)out_len; > -+ return -1; > -+} > -+#endif > - > - static int no_compress(void *in_buf, size_t in_len, void *out_buf, > - size_t *out_len) > diff --git a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch b/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > deleted file mode 100644 > index 23d0111..0000000 > --- a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Ladislav Michl <ladis@linux-mips.org> > -Date: Tue, 3 Aug 2010 13:00:00 +0200 > -Subject: [PATCH] make mkubifs optional > - > -Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > ---- > - Makefile | 6 +++++- > - 1 file changed, 5 insertions(+), 1 deletion(-) > - > -Index: mtd-utils-1.4.6/Makefile > -=================================================================== > ---- mtd-utils-1.4.6.orig/Makefile > -+++ mtd-utils-1.4.6/Makefile > -@@ -13,7 +13,11 @@ else > - JFFS2_COMPR_LZO_O := compr_lzo.o > - endif > - > --SUBDIRS = lib ubi-utils mkfs.ubifs > -+SUBDIRS = lib ubi-utils > -+ifneq ($(WITHOUT_MKUBIFS), 1) > -+ SUBDIRS += mkfs.ubifs > -+endif > -+ > - TESTS = tests > - > - TARGETS = ftl_format flash_erase nanddump doc_loadbios \ > diff --git a/patches/mtd-utils-1.4.6/series b/patches/mtd-utils-1.4.6/series > deleted file mode 100644 > index 4888771..0000000 > --- a/patches/mtd-utils-1.4.6/series > +++ /dev/null > @@ -1,2 +0,0 @@ > -0001-make-liblzo-optional.patch > -0002-make-mkubifs-optional.patch > diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > new file mode 100644 > index 0000000..01c4139 > --- /dev/null > +++ b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > @@ -0,0 +1,24 @@ > +From: Bernhard Walle <bernhard@bwalle.de> > +Date: Sun, 11 Mar 2012 20:03:50 +0100 > +Subject: [PATCH] make ubifs optional > + > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > +--- > + Makefile | 2 ++ > + 1 file changed, 2 insertions(+) > + > +diff --git a/Makefile b/Makefile > +index 17a1216..000dc86 100644 > +--- a/Makefile > ++++ b/Makefile > +@@ -30,8 +30,10 @@ UBI_BINS = \ > + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol > + > + BINS = $(MTD_BINS) > ++ifneq ($(WITHOUT_MKUBIFS), 1) > + BINS += mkfs.ubifs/mkfs.ubifs > + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) > ++endif > + SCRIPTS = flash_eraseall > + > + TARGETS = $(BINS) > diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > new file mode 100644 > index 0000000..7e008de > --- /dev/null > +++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > @@ -0,0 +1,54 @@ > +From: Bernhard Walle <bernhard@bwalle.de> > +Date: Sun, 11 Mar 2012 20:11:14 +0100 > +Subject: [PATCH] Make liblzo optional for ubifs tools > + > +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. > + > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > +--- > + mkfs.ubifs/compr.c | 17 +++++++++++++++++ > + 1 file changed, 17 insertions(+) > + > +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c > +index 4152b6a..244d450 100644 > +--- a/mkfs.ubifs/compr.c > ++++ b/mkfs.ubifs/compr.c > +@@ -24,7 +24,11 @@ > + #include <stdio.h> > + #include <stdint.h> > + #include <string.h> > ++#ifndef WITHOUT_LZO > + #include <lzo/lzo1x.h> > ++#else > ++#define LZO1X_999_MEM_COMPRESS 0 > ++#endif > + #include <linux/types.h> > + > + #define crc32 __zlib_crc32 > +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, > + return 0; > + } > + > ++ > ++#ifndef WITHOUT_LZO > + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > + size_t *out_len) > + { > +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > + > + return 0; > + } > ++#else > ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > ++ size_t *out_len) > ++{ > ++ (void)in_buf; > ++ (void)in_len; > ++ (void)out_buf; > ++ (void)out_len; > ++ return -1; > ++} > ++#endif > + > + static int no_compress(void *in_buf, size_t in_len, void *out_buf, > + size_t *out_len) > diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series > new file mode 100644 > index 0000000..38ac3d1 > --- /dev/null > +++ b/patches/mtd-utils-1.4.9/series > @@ -0,0 +1,5 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-make-ubifs-optional.patch > +0002-Make-liblzo-optional-for-ubifs-tools.patch > +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic > diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make > index ddba9b8..64a0468 100644 > --- a/rules/host-mtd-utils.make > +++ b/rules/host-mtd-utils.make > @@ -33,6 +33,4 @@ HOST_MTD_UTILS_MAKEVARS = \ > BUILDDIR=$(HOST_MTD_UTILS_DIR) \ > DESTDIR=$(HOST_MTD_UTILS_PKGDIR) > > -HOST_MTD_UTILS_MAKE_PAR := NO > - > # vim: syntax=make > diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in > index 800202b..50a489e 100644 > --- a/rules/mtd-utils.in > +++ b/rules/mtd-utils.in > @@ -50,12 +50,6 @@ config MTD_UTILS_FLASH_ERASEALL > comment "flash_eraseall is disabled by busybox flash_eraseall" > depends on BUSYBOX_FLASH_ERASEALL > > -config MTD_UTILS_FLASH_INFO > - bool > - prompt "flash_info" > - help > - print info about a MTD device > - > config MTD_UTILS_FLASH_LOCK > bool > prompt "flash_lock" > @@ -308,8 +302,6 @@ config MTD_UTILS_MKFS_UBIFS > help > Create ubifs filesystems > > -endif > - > config MTD_UTILS_MTDINFO > bool > prompt "mtdinfo" > @@ -317,3 +309,5 @@ config MTD_UTILS_MTDINFO > Print UBI specific information about mtd devices > > endif > + > +endif > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > index b52a170..14df787 100644 > --- a/rules/mtd-utils.make > +++ b/rules/mtd-utils.make > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils > # > # Paths and names > # > -MTD_UTILS_VERSION := 1.4.6 > -MTD_UTILS_MD5 := a0418afcf6026824a5fa5e9051793f3c > +MTD_UTILS_VERSION := 1.4.9 > +MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b > MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) > MTD_UTILS_SUFFIX := tar.bz2 > MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) > @@ -53,7 +53,6 @@ MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1 > endif > > MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR) > -MTD_UTILS_MAKE_PAR := NO > > $(STATEDIR)/mtd-utils.prepare: > @$(call targetinfo) > @@ -88,10 +87,6 @@ ifdef PTXCONF_MTD_UTILS_FLASH_ERASEALL > @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > /usr/sbin/flash_eraseall) > endif > -ifdef PTXCONF_MTD_UTILS_FLASH_INFO > - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > - /usr/sbin/flash_info) > -endif > ifdef PTXCONF_MTD_UTILS_FLASH_LOCK > @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > /usr/sbin/flash_lock) > -- > 1.7.9.4 > > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9 2012-03-13 13:31 ` Michael Olbrich @ 2012-03-13 13:34 ` Michael Olbrich 0 siblings, 0 replies; 8+ messages in thread From: Michael Olbrich @ 2012-03-13 13:34 UTC (permalink / raw) To: ptxdist On Tue, Mar 13, 2012 at 02:31:14PM +0100, Michael Olbrich wrote: > On Tue, Mar 13, 2012 at 01:00:11PM +0100, bernhard@bwalle.de wrote: > > From: Bernhard Walle <bernhard@bwalle.de> > > > > I had to rework some patches. Parallel build has been fixed upstream due > > in commits 5b1cfb9d09a8a40577e79262c6d79dfcde36b1b7 and > > 05f56bf49ee0de8979c29c11f61a01e30e964444, so we should be able to enable > > it here. > > > > flash-info has been dropped and mtdinfo should be used instead. > > This patch does not apply. The last one did. Maybe you have some other > local changes? Arg, probably the other patch you sent. I have some more comment for that, then sent them together. > Michael > > > Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > > --- > > .../0001-make-liblzo-optional.patch | 107 -------------------- > > .../0002-make-mkubifs-optional.patch | 26 ----- > > patches/mtd-utils-1.4.6/series | 2 - > > .../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 24 +++++ > > ...0002-Make-liblzo-optional-for-ubifs-tools.patch | 54 ++++++++++ > > patches/mtd-utils-1.4.9/series | 5 + > > rules/host-mtd-utils.make | 2 - > > rules/mtd-utils.in | 10 +- > > rules/mtd-utils.make | 9 +- > > 9 files changed, 87 insertions(+), 152 deletions(-) > > delete mode 100644 patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > > delete mode 100644 patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > > delete mode 100644 patches/mtd-utils-1.4.6/series > > create mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > > create mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > > create mode 100644 patches/mtd-utils-1.4.9/series > > > > diff --git a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch b/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > > deleted file mode 100644 > > index 00845a1..0000000 > > --- a/patches/mtd-utils-1.4.6/0001-make-liblzo-optional.patch > > +++ /dev/null > > @@ -1,107 +0,0 @@ > > -From: Marc Kleine-Budde <mkl@pengutronix.de> > > -Date: Mon, 20 Jul 2009 19:37:09 +0200 > > -Subject: [PATCH] make liblzo optional > > - > > -Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> > > ---- > > - Makefile | 3 ++- > > - compr.h | 2 ++ > > - mkfs.ubifs/Makefile | 6 +++++- > > - mkfs.ubifs/compr.c | 17 +++++++++++++++++ > > - 4 files changed, 26 insertions(+), 2 deletions(-) > > - > > -Index: mtd-utils-1.4.6/Makefile > > -=================================================================== > > ---- mtd-utils-1.4.6.orig/Makefile > > -+++ mtd-utils-1.4.6/Makefile > > -@@ -10,6 +10,7 @@ ifeq ($(WITHOUT_LZO), 1) > > - CPPFLAGS += -DWITHOUT_LZO > > - else > > - LZOLDLIBS = -llzo2 > > -+ JFFS2_COMPR_LZO_O := compr_lzo.o > > - endif > > - > > - SUBDIRS = lib ubi-utils mkfs.ubifs > > -@@ -50,7 +51,7 @@ $(SYMLINKS): > > - ln -sf ../fs/jffs2/$@ $@ > > - > > - $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ > > -- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ > > -+ compr_rtime.o mkfs.jffs2.o compr_zlib.o $(JFFS2_COMPR_LZO_O) \ > > - compr.o rbtree.o) > > - LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) > > - LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) > > -Index: mtd-utils-1.4.6/compr.h > > -=================================================================== > > ---- mtd-utils-1.4.6.orig/compr.h > > -+++ mtd-utils-1.4.6/compr.h > > -@@ -18,7 +18,9 @@ > > - > > - #define CONFIG_JFFS2_ZLIB > > - #define CONFIG_JFFS2_RTIME > > -+#ifndef WITHOUT_LZO > > - #define CONFIG_JFFS2_LZO > > -+#endif > > - > > - #define JFFS2_RUBINMIPS_PRIORITY 10 > > - #define JFFS2_DYNRUBIN_PRIORITY 20 > > -Index: mtd-utils-1.4.6/mkfs.ubifs/Makefile > > -=================================================================== > > ---- mtd-utils-1.4.6.orig/mkfs.ubifs/Makefile > > -+++ mtd-utils-1.4.6/mkfs.ubifs/Makefile > > -@@ -6,7 +6,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] > > - > > - TARGETS = mkfs.ubifs > > - > > --LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi > > -+ifneq ($(WITHOUT_LZO), 1) > > -+mkfs.ubifs_LIBLZO = -llzo2 > > -+endif > > -+ > > -+LDLIBS_mkfs.ubifs = -lz $(mkfs.ubifs_LIBLZO) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi > > - LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd > > - LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS) > > - > > -Index: mtd-utils-1.4.6/mkfs.ubifs/compr.c > > -=================================================================== > > ---- mtd-utils-1.4.6.orig/mkfs.ubifs/compr.c > > -+++ mtd-utils-1.4.6/mkfs.ubifs/compr.c > > -@@ -24,7 +24,11 @@ > > - #include <stdio.h> > > - #include <stdint.h> > > - #include <string.h> > > -+#ifndef WITHOUT_LZO > > - #include <lzo/lzo1x.h> > > -+#else > > -+#define LZO1X_999_MEM_COMPRESS 0 > > -+#endif > > - #include <linux/types.h> > > - > > - #define crc32 __zlib_crc32 > > -@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, si > > - return 0; > > - } > > - > > -+ > > -+#ifndef WITHOUT_LZO > > - static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > > - size_t *out_len) > > - { > > -@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, si > > - > > - return 0; > > - } > > -+#else > > -+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > > -+ size_t *out_len) > > -+{ > > -+ (void)in_buf; > > -+ (void)in_len; > > -+ (void)out_buf; > > -+ (void)out_len; > > -+ return -1; > > -+} > > -+#endif > > - > > - static int no_compress(void *in_buf, size_t in_len, void *out_buf, > > - size_t *out_len) > > diff --git a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch b/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > > deleted file mode 100644 > > index 23d0111..0000000 > > --- a/patches/mtd-utils-1.4.6/0002-make-mkubifs-optional.patch > > +++ /dev/null > > @@ -1,26 +0,0 @@ > > -From: Ladislav Michl <ladis@linux-mips.org> > > -Date: Tue, 3 Aug 2010 13:00:00 +0200 > > -Subject: [PATCH] make mkubifs optional > > - > > -Signed-off-by: Ladislav Michl <ladis@linux-mips.org> > > ---- > > - Makefile | 6 +++++- > > - 1 file changed, 5 insertions(+), 1 deletion(-) > > - > > -Index: mtd-utils-1.4.6/Makefile > > -=================================================================== > > ---- mtd-utils-1.4.6.orig/Makefile > > -+++ mtd-utils-1.4.6/Makefile > > -@@ -13,7 +13,11 @@ else > > - JFFS2_COMPR_LZO_O := compr_lzo.o > > - endif > > - > > --SUBDIRS = lib ubi-utils mkfs.ubifs > > -+SUBDIRS = lib ubi-utils > > -+ifneq ($(WITHOUT_MKUBIFS), 1) > > -+ SUBDIRS += mkfs.ubifs > > -+endif > > -+ > > - TESTS = tests > > - > > - TARGETS = ftl_format flash_erase nanddump doc_loadbios \ > > diff --git a/patches/mtd-utils-1.4.6/series b/patches/mtd-utils-1.4.6/series > > deleted file mode 100644 > > index 4888771..0000000 > > --- a/patches/mtd-utils-1.4.6/series > > +++ /dev/null > > @@ -1,2 +0,0 @@ > > -0001-make-liblzo-optional.patch > > -0002-make-mkubifs-optional.patch > > diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > > new file mode 100644 > > index 0000000..01c4139 > > --- /dev/null > > +++ b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch > > @@ -0,0 +1,24 @@ > > +From: Bernhard Walle <bernhard@bwalle.de> > > +Date: Sun, 11 Mar 2012 20:03:50 +0100 > > +Subject: [PATCH] make ubifs optional > > + > > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > > +--- > > + Makefile | 2 ++ > > + 1 file changed, 2 insertions(+) > > + > > +diff --git a/Makefile b/Makefile > > +index 17a1216..000dc86 100644 > > +--- a/Makefile > > ++++ b/Makefile > > +@@ -30,8 +30,10 @@ UBI_BINS = \ > > + ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol > > + > > + BINS = $(MTD_BINS) > > ++ifneq ($(WITHOUT_MKUBIFS), 1) > > + BINS += mkfs.ubifs/mkfs.ubifs > > + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) > > ++endif > > + SCRIPTS = flash_eraseall > > + > > + TARGETS = $(BINS) > > diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > > new file mode 100644 > > index 0000000..7e008de > > --- /dev/null > > +++ b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch > > @@ -0,0 +1,54 @@ > > +From: Bernhard Walle <bernhard@bwalle.de> > > +Date: Sun, 11 Mar 2012 20:11:14 +0100 > > +Subject: [PATCH] Make liblzo optional for ubifs tools > > + > > +Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>. > > + > > +Signed-off-by: Bernhard Walle <bernhard@bwalle.de> > > +--- > > + mkfs.ubifs/compr.c | 17 +++++++++++++++++ > > + 1 file changed, 17 insertions(+) > > + > > +diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c > > +index 4152b6a..244d450 100644 > > +--- a/mkfs.ubifs/compr.c > > ++++ b/mkfs.ubifs/compr.c > > +@@ -24,7 +24,11 @@ > > + #include <stdio.h> > > + #include <stdint.h> > > + #include <string.h> > > ++#ifndef WITHOUT_LZO > > + #include <lzo/lzo1x.h> > > ++#else > > ++#define LZO1X_999_MEM_COMPRESS 0 > > ++#endif > > + #include <linux/types.h> > > + > > + #define crc32 __zlib_crc32 > > +@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, > > + return 0; > > + } > > + > > ++ > > ++#ifndef WITHOUT_LZO > > + static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > > + size_t *out_len) > > + { > > +@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > > + > > + return 0; > > + } > > ++#else > > ++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf, > > ++ size_t *out_len) > > ++{ > > ++ (void)in_buf; > > ++ (void)in_len; > > ++ (void)out_buf; > > ++ (void)out_len; > > ++ return -1; > > ++} > > ++#endif > > + > > + static int no_compress(void *in_buf, size_t in_len, void *out_buf, > > + size_t *out_len) > > diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series > > new file mode 100644 > > index 0000000..38ac3d1 > > --- /dev/null > > +++ b/patches/mtd-utils-1.4.9/series > > @@ -0,0 +1,5 @@ > > +# generated by git-ptx-patches > > +#tag:base --start-number 1 > > +0001-make-ubifs-optional.patch > > +0002-Make-liblzo-optional-for-ubifs-tools.patch > > +# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic > > diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make > > index ddba9b8..64a0468 100644 > > --- a/rules/host-mtd-utils.make > > +++ b/rules/host-mtd-utils.make > > @@ -33,6 +33,4 @@ HOST_MTD_UTILS_MAKEVARS = \ > > BUILDDIR=$(HOST_MTD_UTILS_DIR) \ > > DESTDIR=$(HOST_MTD_UTILS_PKGDIR) > > > > -HOST_MTD_UTILS_MAKE_PAR := NO > > - > > # vim: syntax=make > > diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in > > index 800202b..50a489e 100644 > > --- a/rules/mtd-utils.in > > +++ b/rules/mtd-utils.in > > @@ -50,12 +50,6 @@ config MTD_UTILS_FLASH_ERASEALL > > comment "flash_eraseall is disabled by busybox flash_eraseall" > > depends on BUSYBOX_FLASH_ERASEALL > > > > -config MTD_UTILS_FLASH_INFO > > - bool > > - prompt "flash_info" > > - help > > - print info about a MTD device > > - > > config MTD_UTILS_FLASH_LOCK > > bool > > prompt "flash_lock" > > @@ -308,8 +302,6 @@ config MTD_UTILS_MKFS_UBIFS > > help > > Create ubifs filesystems > > > > -endif > > - > > config MTD_UTILS_MTDINFO > > bool > > prompt "mtdinfo" > > @@ -317,3 +309,5 @@ config MTD_UTILS_MTDINFO > > Print UBI specific information about mtd devices > > > > endif > > + > > +endif > > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > > index b52a170..14df787 100644 > > --- a/rules/mtd-utils.make > > +++ b/rules/mtd-utils.make > > @@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils > > # > > # Paths and names > > # > > -MTD_UTILS_VERSION := 1.4.6 > > -MTD_UTILS_MD5 := a0418afcf6026824a5fa5e9051793f3c > > +MTD_UTILS_VERSION := 1.4.9 > > +MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b > > MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION) > > MTD_UTILS_SUFFIX := tar.bz2 > > MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) > > @@ -53,7 +53,6 @@ MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1 > > endif > > > > MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR) > > -MTD_UTILS_MAKE_PAR := NO > > > > $(STATEDIR)/mtd-utils.prepare: > > @$(call targetinfo) > > @@ -88,10 +87,6 @@ ifdef PTXCONF_MTD_UTILS_FLASH_ERASEALL > > @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > > /usr/sbin/flash_eraseall) > > endif > > -ifdef PTXCONF_MTD_UTILS_FLASH_INFO > > - @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > > - /usr/sbin/flash_info) > > -endif > > ifdef PTXCONF_MTD_UTILS_FLASH_LOCK > > @$(call install_copy, mtd-utils, 0, 0, 0755, -, \ > > /usr/sbin/flash_lock) > > -- > > 1.7.9.4 > > > > > > -- > > ptxdist mailing list > > ptxdist@pengutronix.de > > > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | > > -- > ptxdist mailing list > ptxdist@pengutronix.de > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | -- ptxdist mailing list ptxdist@pengutronix.de ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-07-24 19:56 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2012-07-23 20:24 [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle 2012-07-23 20:28 ` Thomas Petazzoni 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.5.0 Bernhard Walle 2012-07-24 19:56 ` Michael Olbrich 2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle -- strict thread matches above, loose matches on Subject: below -- 2012-03-13 12:02 [ptxdist] [PATCH 1/3] " Bernhard Walle 2012-03-13 12:00 ` [ptxdist] [PATCH] " bernhard 2012-03-13 13:31 ` Michael Olbrich 2012-03-13 13:34 ` Michael Olbrich
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox