On Mon, Mar 12, 2012 at 03:09:03PM +0100, bernh...@bwalle.de wrote:
> From: Bernhard Walle <bernh...@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 in favour to mtdinfo.
An option for mtdinfo already exists.
>
> Signed-off-by: Bernhard Walle <bernh...@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 ++++++++++
> ...e-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch | 24 +++++
> patches/mtd-utils-1.4.9/series | 6 ++
> rules/host-mtd-utils.make | 2 -
> rules/mtd-utils.in | 4 +-
> rules/mtd-utils.make | 9 +-
> 10 files changed, 114 insertions(+), 144 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/0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.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 <m...@pengutronix.de>
> -Date: Mon, 20 Jul 2009 19:37:09 +0200
> -Subject: [PATCH] make liblzo optional
> -
> -Signed-off-by: Marc Kleine-Budde <m...@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 <la...@linux-mips.org>
> -Date: Tue, 3 Aug 2010 13:00:00 +0200
> -Subject: [PATCH] make mkubifs optional
> -
> -Signed-off-by: Ladislav Michl <la...@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 <bernh...@bwalle.de>
> +Date: Sun, 11 Mar 2012 20:03:50 +0100
> +Subject: [PATCH] make ubifs optional
> +
> +Signed-off-by: Bernhard Walle <bernh...@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 <bernh...@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 <m...@pengutronix.de>.
> +
> +Signed-off-by: Bernhard Walle <bernh...@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/0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch
>
> b/patches/mtd-utils-1.4.9/0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch
> new file mode 100644
> index 0000000..24b7bb3
> --- /dev/null
> +++
> b/patches/mtd-utils-1.4.9/0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch
> @@ -0,0 +1,24 @@
> +From: Bernhard Walle <bernh...@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.
Michael
> +Signed-off-by: Bernhard Walle <bernh...@bwalle.de>
> +---
> + Makefile | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile b/Makefile
> +index 000dc86..4068fb4 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 -llzo2 -lm -luuid $(LZOLDFLAGS)
> + $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
> +
> + #
> diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series
> new file mode 100644
> index 0000000..e1ef698
> --- /dev/null
> +++ b/patches/mtd-utils-1.4.9/series
> @@ -0,0 +1,6 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-make-ubifs-optional.patch
> +0002-Make-liblzo-optional-for-ubifs-tools.patch
> +0003-Makefile-Use-LZOLDFLAGS-when-building-mkfs.ubifs.patch
> +# 5446241c6d543dcf15f517362e9b1de1 - 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 a9bab13..bc25ace 100644
> --- a/rules/mtd-utils.in
> +++ b/rules/mtd-utils.in
> @@ -46,9 +46,9 @@ config MTD_UTILS_FLASH_ERASEALL
> help
> ...use flash_erase instead
>
> -config MTD_UTILS_FLASH_INFO
> +config MTD_UTILS_MTDINFO
> bool
> - prompt "flash_info"
> + prompt "mtdinfo"
> help
> print info about a MTD device
>
> diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
> index b52a170..2288819 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,9 +87,9 @@ 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
> +ifdef PTXCONF_MTD_UTILS_MTDINFO
> @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> - /usr/sbin/flash_info)
> + /usr/sbin/mtdinfo)
> endif
> ifdef PTXCONF_MTD_UTILS_FLASH_LOCK
> @$(call install_copy, mtd-utils, 0, 0, 0755, -, \
> --
> 1.7.9.3
>
>
> --
> 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
