Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9

2012-07-23 Thread Bernhard Walle 
Am 23.07.12 22:28, schrieb Thomas Petazzoni:
 
 I guess the title of the patch is Update mtd-utils to 1.5.0, no? :-)

Of course, just a copy and paste error. Thanks for spotting that!


Regards,
Bernhard


-- 
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9

2012-03-13 Thread Michael Olbrich 
On Tue, Mar 13, 2012 at 01:00:11PM +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
 05f56bf49ee0de8979c29c11f61a01e30e96, 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 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 ++
  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..000
 --- 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)
 -+{
 -+

Re: [ptxdist] [PATCH] Update mtd-utils to 1.4.9

2012-03-13 Thread Michael Olbrich 
On Tue, Mar 13, 2012 at 02:31:14PM +0100, Michael Olbrich wrote:
 On Tue, Mar 13, 2012 at 01:00:11PM +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
  05f56bf49ee0de8979c29c11f61a01e30e96, 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 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 ++
   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..000
  --- 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_COMPRESS0
  -+#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