* [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9
@ 2012-03-12 14:09 bernhard
2012-03-12 14:09 ` [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies bernhard
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: bernhard @ 2012-03-12 14:09 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 in favour to mtdinfo.
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 ++++++++++
...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 <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/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 <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.
+
+Signed-off-by: Bernhard Walle <bernhard@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
^ permalink raw reply [flat|nested] 12+ messages in thread
* [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies
2012-03-12 14:09 [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 bernhard
@ 2012-03-12 14:09 ` bernhard
2012-03-13 9:12 ` Michael Olbrich
2012-03-12 14:09 ` [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments bernhard
2012-03-13 9:09 ` [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 Michael Olbrich
2 siblings, 1 reply; 12+ messages in thread
From: bernhard @ 2012-03-12 14:09 UTC (permalink / raw)
To: ptxdist; +Cc: Bernhard Walle
From: Bernhard Walle <walle@corscience.de>
Some tools that mtd-utils provide can be also provided by busybox. Add
the dependencies here as done in other configuration files to prevent
the user from misconfiguration.
Signed-off-by: Bernhard Walle <walle@corscience.de>
---
rules/mtd-utils.in | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index bc25ace..30ec133 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -43,9 +43,13 @@ config MTD_UTILS_FLASH_ERASEALL
bool
prompt "flash_eraseall (deprecated)"
select MTD_UTILS_FLASH_ERASE
+ depends on !BUSYBOX_FLASH_ERASEALL
help
...use flash_erase instead
+comment "busybox' flash_eraseall is selected!"
+ depends on BUSYBOX_FLASH_ERASEALL
+
config MTD_UTILS_MTDINFO
bool
prompt "mtdinfo"
@@ -55,9 +59,13 @@ config MTD_UTILS_MTDINFO
config MTD_UTILS_FLASH_LOCK
bool
prompt "flash_lock"
+ depends on !BUSYBOX_FLASH_LOCK
help
This utility locks one or more sectors of flash device.
+comment "busybox' flash_lock is selected!"
+ depends on BUSYBOX_FLASH_LOCK
+
config MTD_UTILS_FLASH_OTP_DUMP
bool
prompt "flash_otp_dump"
@@ -73,15 +81,23 @@ config MTD_UTILS_FLASH_OTP_INFO
config MTD_UTILS_FLASH_UNLOCK
bool
prompt "flash_unlock"
+ depends on !BUSYBOX_FLASH_UNLOCK
help
This utility unlock all sectors of flash device.
+comment "busybox' flash_unlock is selected!"
+ depends on BUSYBOX_FLASH_UNLOCK
+
config MTD_UTILS_FLASHCP
bool
prompt "flashcp"
+ depends on !BUSYBOX_FLASHCP
help
Flash Copy - Written by Abraham van der Merwe
+comment "busybox' flashcp is selected!"
+ depends on BUSYBOX_FLASHCP
+
config MTD_UTILS_FTL_CHECK
bool
prompt "ftl_check"
@@ -126,10 +142,14 @@ config MTD_UTILS_MTDDEBUG
config MTD_UTILS_NANDDUMP
bool
prompt "nanddump"
+ depends on !BUSYBOX_NANDDUMP
help
This utility dumps the contents of raw NAND chips or NAND
chips contained in DoC devices.
+comment "busybox' nanddump is selected!"
+ depends on BUSYBOX_NANDDUMP
+
config MTD_UTILS_NANDTEST
bool
prompt "nandtest"
@@ -139,11 +159,15 @@ config MTD_UTILS_NANDTEST
config MTD_UTILS_NANDWRITE
bool
prompt "nandwrite"
+ depends on !BUSYBOX_NANDWRITE
help
This utility writes a binary image directly to a NAND flash
chip or NAND chips contained in DoC devices. This is the
"inverse operation" of nanddump.
+comment "busybox' nandwrite is selected!"
+ depends on BUSYBOX_NANDWRITE
+
config MTD_UTILS_NFTL_FORMAT
bool
prompt "nftl_format"
@@ -206,9 +230,13 @@ if MTD_UTILS_UBI_UTILS
config MTD_UTILS_UBIATTACH
bool
prompt "ubiattach"
+ depends on !BUSYBOX_UBIATTACH
help
Attach an ubi device to a mtd device
+comment "busybox' ubiattach is selected!"
+ depends on BUSYBOX_UBIATTACH
+
config MTD_UTILS_UBICRC32
bool
prompt "ubicrc32"
@@ -218,9 +246,13 @@ config MTD_UTILS_UBICRC32
config MTD_UTILS_UBIDETACH
bool
prompt "ubidetach"
+ depends on !BUSYBOX_UBIDETACH
help
Detach an ubi device from a mtd device
+comment "busybox' ubidetach is selected!"
+ depends on BUSYBOX_UBIDETACH
+
config MTD_UTILS_UBIFORMAT
bool
select GCCLIBS_GCC_S
--
1.7.9.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments
2012-03-12 14:09 [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 bernhard
2012-03-12 14:09 ` [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies bernhard
@ 2012-03-12 14:09 ` bernhard
2012-03-13 9:14 ` Michael Olbrich
2012-03-13 9:09 ` [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 Michael Olbrich
2 siblings, 1 reply; 12+ messages in thread
From: bernhard @ 2012-03-12 14:09 UTC (permalink / raw)
To: ptxdist; +Cc: Bernhard Walle
From: Bernhard Walle <walle@corscience.de>
Signed-off-by: Bernhard Walle <walle@corscience.de>
---
rules/procps.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rules/procps.in b/rules/procps.in
index 0d83125..11886be 100644
--- a/rules/procps.in
+++ b/rules/procps.in
@@ -21,7 +21,7 @@ config PROCPS_TOP
system.
Note: This command enlarges your system by the ncurses library.
-comment "top is disabled by busybox top"
+comment "busybox' top is selected!"
depends on BUSYBOX_TOP
config PROCPS_SLABTOP
@@ -38,7 +38,7 @@ config PROCPS_SYSCTL
help
configure kernel parameters at runtime
-comment "sysctl is disabled by busybox sysctl"
+comment "busybox' sysctl is selected!"
depends on BUSYBOX_BB_SYSCTL
config PROCPS_PS
@@ -50,7 +50,7 @@ config PROCPS_PS
analyse current states of all processes running on
the system
-comment "ps is disabled by busybox ps"
+comment "busybox' ps is selected!"
depends on BUSYBOX_PS
config PROCPS_W
@@ -66,7 +66,7 @@ config PROCPS_PGREP
help
look up processes based on name and other attributes
-comment "pgrep is disabled by busybox pgrep"
+comment "busybox' pgrep is selected!"
depends on BUSYBOX_PGREP
endif
--
1.7.9.3
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9
2012-03-12 14:09 [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 bernhard
2012-03-12 14:09 ` [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies bernhard
2012-03-12 14:09 ` [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments bernhard
@ 2012-03-13 9:09 ` Michael Olbrich
2012-03-13 12:02 ` Bernhard Walle
2 siblings, 1 reply; 12+ messages in thread
From: Michael Olbrich @ 2012-03-13 9:09 UTC (permalink / raw)
To: ptxdist
On Mon, Mar 12, 2012 at 03:09:03PM +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 in favour to mtdinfo.
An option for mtdinfo already exists.
>
> 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 ++++++++++
> ...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 <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/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 <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.
Michael
> +Signed-off-by: Bernhard Walle <bernhard@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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies
2012-03-12 14:09 ` [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies bernhard
@ 2012-03-13 9:12 ` Michael Olbrich
2012-03-13 9:18 ` Bernhard Walle
0 siblings, 1 reply; 12+ messages in thread
From: Michael Olbrich @ 2012-03-13 9:12 UTC (permalink / raw)
To: ptxdist
On Mon, Mar 12, 2012 at 03:09:04PM +0100, bernhard@bwalle.de wrote:
> From: Bernhard Walle <walle@corscience.de>
>
> Some tools that mtd-utils provide can be also provided by busybox. Add
> the dependencies here as done in other configuration files to prevent
> the user from misconfiguration.
>
> Signed-off-by: Bernhard Walle <walle@corscience.de>
> ---
> rules/mtd-utils.in | 32 ++++++++++++++++++++++++++++++++
> 1 file changed, 32 insertions(+)
>
> diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
> index bc25ace..30ec133 100644
> --- a/rules/mtd-utils.in
> +++ b/rules/mtd-utils.in
> @@ -43,9 +43,13 @@ config MTD_UTILS_FLASH_ERASEALL
> bool
> prompt "flash_eraseall (deprecated)"
> select MTD_UTILS_FLASH_ERASE
> + depends on !BUSYBOX_FLASH_ERASEALL
depends on !BUSYBOX_FLASH_ERASEALL || ALLYES
For all. Sorry, I missed that in the last review.
Michael
> help
> ...use flash_erase instead
>
> +comment "busybox' flash_eraseall is selected!"
> + depends on BUSYBOX_FLASH_ERASEALL
> +
> config MTD_UTILS_MTDINFO
> bool
> prompt "mtdinfo"
> @@ -55,9 +59,13 @@ config MTD_UTILS_MTDINFO
> config MTD_UTILS_FLASH_LOCK
> bool
> prompt "flash_lock"
> + depends on !BUSYBOX_FLASH_LOCK
> help
> This utility locks one or more sectors of flash device.
>
> +comment "busybox' flash_lock is selected!"
> + depends on BUSYBOX_FLASH_LOCK
> +
> config MTD_UTILS_FLASH_OTP_DUMP
> bool
> prompt "flash_otp_dump"
> @@ -73,15 +81,23 @@ config MTD_UTILS_FLASH_OTP_INFO
> config MTD_UTILS_FLASH_UNLOCK
> bool
> prompt "flash_unlock"
> + depends on !BUSYBOX_FLASH_UNLOCK
> help
> This utility unlock all sectors of flash device.
>
> +comment "busybox' flash_unlock is selected!"
> + depends on BUSYBOX_FLASH_UNLOCK
> +
> config MTD_UTILS_FLASHCP
> bool
> prompt "flashcp"
> + depends on !BUSYBOX_FLASHCP
> help
> Flash Copy - Written by Abraham van der Merwe
>
> +comment "busybox' flashcp is selected!"
> + depends on BUSYBOX_FLASHCP
> +
> config MTD_UTILS_FTL_CHECK
> bool
> prompt "ftl_check"
> @@ -126,10 +142,14 @@ config MTD_UTILS_MTDDEBUG
> config MTD_UTILS_NANDDUMP
> bool
> prompt "nanddump"
> + depends on !BUSYBOX_NANDDUMP
> help
> This utility dumps the contents of raw NAND chips or NAND
> chips contained in DoC devices.
>
> +comment "busybox' nanddump is selected!"
> + depends on BUSYBOX_NANDDUMP
> +
> config MTD_UTILS_NANDTEST
> bool
> prompt "nandtest"
> @@ -139,11 +159,15 @@ config MTD_UTILS_NANDTEST
> config MTD_UTILS_NANDWRITE
> bool
> prompt "nandwrite"
> + depends on !BUSYBOX_NANDWRITE
> help
> This utility writes a binary image directly to a NAND flash
> chip or NAND chips contained in DoC devices. This is the
> "inverse operation" of nanddump.
>
> +comment "busybox' nandwrite is selected!"
> + depends on BUSYBOX_NANDWRITE
> +
> config MTD_UTILS_NFTL_FORMAT
> bool
> prompt "nftl_format"
> @@ -206,9 +230,13 @@ if MTD_UTILS_UBI_UTILS
> config MTD_UTILS_UBIATTACH
> bool
> prompt "ubiattach"
> + depends on !BUSYBOX_UBIATTACH
> help
> Attach an ubi device to a mtd device
>
> +comment "busybox' ubiattach is selected!"
> + depends on BUSYBOX_UBIATTACH
> +
> config MTD_UTILS_UBICRC32
> bool
> prompt "ubicrc32"
> @@ -218,9 +246,13 @@ config MTD_UTILS_UBICRC32
> config MTD_UTILS_UBIDETACH
> bool
> prompt "ubidetach"
> + depends on !BUSYBOX_UBIDETACH
> help
> Detach an ubi device from a mtd device
>
> +comment "busybox' ubidetach is selected!"
> + depends on BUSYBOX_UBIDETACH
> +
> config MTD_UTILS_UBIFORMAT
> bool
> select GCCLIBS_GCC_S
> --
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments
2012-03-12 14:09 ` [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments bernhard
@ 2012-03-13 9:14 ` Michael Olbrich
0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2012-03-13 9:14 UTC (permalink / raw)
To: ptxdist
On Mon, Mar 12, 2012 at 03:09:05PM +0100, bernhard@bwalle.de wrote:
> From: Bernhard Walle <walle@corscience.de>
Thanks, applied.
Michael
> Signed-off-by: Bernhard Walle <walle@corscience.de>
> ---
> rules/procps.in | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/rules/procps.in b/rules/procps.in
> index 0d83125..11886be 100644
> --- a/rules/procps.in
> +++ b/rules/procps.in
> @@ -21,7 +21,7 @@ config PROCPS_TOP
> system.
> Note: This command enlarges your system by the ncurses library.
>
> -comment "top is disabled by busybox top"
> +comment "busybox' top is selected!"
> depends on BUSYBOX_TOP
>
> config PROCPS_SLABTOP
> @@ -38,7 +38,7 @@ config PROCPS_SYSCTL
> help
> configure kernel parameters at runtime
>
> -comment "sysctl is disabled by busybox sysctl"
> +comment "busybox' sysctl is selected!"
> depends on BUSYBOX_BB_SYSCTL
>
> config PROCPS_PS
> @@ -50,7 +50,7 @@ config PROCPS_PS
> analyse current states of all processes running on
> the system
>
> -comment "ps is disabled by busybox ps"
> +comment "busybox' ps is selected!"
> depends on BUSYBOX_PS
>
> config PROCPS_W
> @@ -66,7 +66,7 @@ config PROCPS_PGREP
> help
> look up processes based on name and other attributes
>
> -comment "pgrep is disabled by busybox pgrep"
> +comment "busybox' pgrep is selected!"
> depends on BUSYBOX_PGREP
>
> endif
> --
> 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
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies
2012-03-13 9:12 ` Michael Olbrich
@ 2012-03-13 9:18 ` Bernhard Walle
2012-03-13 9:41 ` Michael Olbrich
0 siblings, 1 reply; 12+ messages in thread
From: Bernhard Walle @ 2012-03-13 9:18 UTC (permalink / raw)
To: ptxdist
* Michael Olbrich <m.olbrich@pengutronix.de> [2012-03-13 10:12]:
> On Mon, Mar 12, 2012 at 03:09:04PM +0100, bernhard@bwalle.de wrote:
> > From: Bernhard Walle <walle@corscience.de>
> >
> > Some tools that mtd-utils provide can be also provided by busybox. Add
> > the dependencies here as done in other configuration files to prevent
> > the user from misconfiguration.
> >
> > Signed-off-by: Bernhard Walle <walle@corscience.de>
> > ---
> > rules/mtd-utils.in | 32 ++++++++++++++++++++++++++++++++
> > 1 file changed, 32 insertions(+)
> >
> > diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
> > index bc25ace..30ec133 100644
> > --- a/rules/mtd-utils.in
> > +++ b/rules/mtd-utils.in
> > @@ -43,9 +43,13 @@ config MTD_UTILS_FLASH_ERASEALL
> > bool
> > prompt "flash_eraseall (deprecated)"
> > select MTD_UTILS_FLASH_ERASE
> > + depends on !BUSYBOX_FLASH_ERASEALL
>
> depends on !BUSYBOX_FLASH_ERASEALL || ALLYES
>
> For all. Sorry, I missed that in the last review.
Only for that one in rules/mtd-utils.in or really for all such Busybox
comments?
Regards,
Bernhard
--
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies
2012-03-13 9:18 ` Bernhard Walle
@ 2012-03-13 9:41 ` Michael Olbrich
0 siblings, 0 replies; 12+ messages in thread
From: Michael Olbrich @ 2012-03-13 9:41 UTC (permalink / raw)
To: ptxdist
On Tue, Mar 13, 2012 at 10:18:12AM +0100, Bernhard Walle wrote:
> * Michael Olbrich <m.olbrich@pengutronix.de> [2012-03-13 10:12]:
> > On Mon, Mar 12, 2012 at 03:09:04PM +0100, bernhard@bwalle.de wrote:
> > > From: Bernhard Walle <walle@corscience.de>
> > >
> > > Some tools that mtd-utils provide can be also provided by busybox. Add
> > > the dependencies here as done in other configuration files to prevent
> > > the user from misconfiguration.
> > >
> > > Signed-off-by: Bernhard Walle <walle@corscience.de>
> > > ---
> > > rules/mtd-utils.in | 32 ++++++++++++++++++++++++++++++++
> > > 1 file changed, 32 insertions(+)
> > >
> > > diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
> > > index bc25ace..30ec133 100644
> > > --- a/rules/mtd-utils.in
> > > +++ b/rules/mtd-utils.in
> > > @@ -43,9 +43,13 @@ config MTD_UTILS_FLASH_ERASEALL
> > > bool
> > > prompt "flash_eraseall (deprecated)"
> > > select MTD_UTILS_FLASH_ERASE
> > > + depends on !BUSYBOX_FLASH_ERASEALL
> >
> > depends on !BUSYBOX_FLASH_ERASEALL || ALLYES
> >
> > For all. Sorry, I missed that in the last review.
>
> Only for that one in rules/mtd-utils.in or really for all such Busybox
> comments?
Not the comments, just the tool. This is for compile-time testing. With
ALLYES enabled we can build everything in with one ptxconfig.
rules/coreutils.in is a good example on how it should look like.
Michael
--
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] 12+ messages in thread
* [ptxdist] [PATCH] Update mtd-utils to 1.4.9
2012-03-13 12:02 ` Bernhard Walle
@ 2012-03-13 12:00 ` bernhard
2012-03-13 13:31 ` Michael Olbrich
0 siblings, 1 reply; 12+ 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] 12+ messages in thread
* Re: [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9
2012-03-13 9:09 ` [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 Michael Olbrich
@ 2012-03-13 12:02 ` Bernhard Walle
2012-03-13 12:00 ` [ptxdist] [PATCH] " bernhard
0 siblings, 1 reply; 12+ 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] 12+ 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; 12+ 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] 12+ 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; 12+ 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] 12+ messages in thread
end of thread, other threads:[~2012-03-13 13:34 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-12 14:09 [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 bernhard
2012-03-12 14:09 ` [ptxdist] [PATCH 2/3] mtd-utils.in: Add busybox dependencies bernhard
2012-03-13 9:12 ` Michael Olbrich
2012-03-13 9:18 ` Bernhard Walle
2012-03-13 9:41 ` Michael Olbrich
2012-03-12 14:09 ` [ptxdist] [PATCH 3/3] procps.in: Unify wording of busybox comments bernhard
2012-03-13 9:14 ` Michael Olbrich
2012-03-13 9:09 ` [ptxdist] [PATCH 1/3] Update mtd-utils to 1.4.9 Michael Olbrich
2012-03-13 12:02 ` 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