From: Bernhard Walle <bernhard@bwalle.de>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] Update mtd-utils to 1.4.9
Date: Mon, 23 Jul 2012 22:24:17 +0200 [thread overview]
Message-ID: <1343075057-22209-1-git-send-email-bernhard@bwalle.de> (raw)
Tested on a beagle board.
Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
---
.../mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 23 -------
...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 --------------------
patches/mtd-utils-1.4.9/series | 5 --
.../mtd-utils-1.5.0/0001-make-ubifs-optional.patch | 23 +++++++
...0002-Make-liblzo-optional-for-ubifs-tools.patch | 68 ++++++++++++++++++++
patches/mtd-utils-1.5.0/series | 5 ++
rules/mtd-utils.make | 4 +-
7 files changed, 98 insertions(+), 98 deletions(-)
delete mode 100644 patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch
delete mode 100644 patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
delete mode 100644 patches/mtd-utils-1.4.9/series
create mode 100644 patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch
create mode 100644 patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch
create mode 100644 patches/mtd-utils-1.5.0/series
diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch
deleted file mode 100644
index 2cbce09..0000000
--- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Sun, 11 Mar 2012 20:03:50 +0100
-Subject: [PATCH] make ubifs optional
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
----
- Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/Makefile b/Makefile
-index 17a1216..5e1692f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -30,7 +30,9 @@ UBI_BINS = \
- ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
-
- BINS = $(MTD_BINS)
-+ifneq ($(WITHOUT_MKUBIFS), 1)
- BINS += mkfs.ubifs/mkfs.ubifs
-+endif
- BINS += $(addprefix ubi-utils/,$(UBI_BINS))
- SCRIPTS = flash_eraseall
-
diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
deleted file mode 100644
index eacff21..0000000
--- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Bernhard Walle <bernhard@bwalle.de>
-Date: Sun, 11 Mar 2012 20:11:14 +0100
-Subject: [PATCH] Make liblzo optional for ubifs tools
-
-Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>.
-
-Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
----
- Makefile | 2 +-
- mkfs.ubifs/compr.c | 17 +++++++++++++++++
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 000dc86..83eb9ce 100644
---- a/Makefile
-+++ b/Makefile
-@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a)
- #
- obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
- hashtable/hashtable.o hashtable/hashtable_itr.o
--LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
-+LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
- $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
-
- #
-diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
-index 4152b6a..244d450 100644
---- a/mkfs.ubifs/compr.c
-+++ b/mkfs.ubifs/compr.c
-@@ -24,7 +24,11 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <string.h>
-+#ifndef WITHOUT_LZO
- #include <lzo/lzo1x.h>
-+#else
-+#define LZO1X_999_MEM_COMPRESS 0
-+#endif
- #include <linux/types.h>
-
- #define crc32 __zlib_crc32
-@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
- return 0;
- }
-
-+
-+#ifndef WITHOUT_LZO
- static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
- size_t *out_len)
- {
-@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
-
- return 0;
- }
-+#else
-+static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
-+ size_t *out_len)
-+{
-+ (void)in_buf;
-+ (void)in_len;
-+ (void)out_buf;
-+ (void)out_len;
-+ return -1;
-+}
-+#endif
-
- static int no_compress(void *in_buf, size_t in_len, void *out_buf,
- size_t *out_len)
diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.4.9/series
deleted file mode 100644
index 38ac3d1..0000000
--- a/patches/mtd-utils-1.4.9/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-make-ubifs-optional.patch
-0002-Make-liblzo-optional-for-ubifs-tools.patch
-# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic
diff --git a/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch
new file mode 100644
index 0000000..2dec433
--- /dev/null
+++ b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch
@@ -0,0 +1,23 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Sun, 11 Mar 2012 20:03:50 +0100
+Subject: [PATCH] make ubifs optional
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ Makefile | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index f380b42..a682a8f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -30,7 +30,9 @@ UBI_BINS = \
+ ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
+
+ BINS = $(MTD_BINS)
++ifneq ($(WITHOUT_MKUBIFS), 1)
+ BINS += mkfs.ubifs/mkfs.ubifs
++endif
+ BINS += $(addprefix ubi-utils/,$(UBI_BINS))
+ SCRIPTS = flash_eraseall
+
diff --git a/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch
new file mode 100644
index 0000000..01c3656
--- /dev/null
+++ b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch
@@ -0,0 +1,68 @@
+From: Bernhard Walle <bernhard@bwalle.de>
+Date: Sun, 11 Mar 2012 20:11:14 +0100
+Subject: [PATCH] Make liblzo optional for ubifs tools
+
+Based on patch from Marc Kleine-Budde <mkl@pengutronix.de>.
+
+Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
+---
+ Makefile | 2 +-
+ mkfs.ubifs/compr.c | 17 +++++++++++++++++
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index a682a8f..190db58 100644
+--- a/Makefile
++++ b/Makefile
+@@ -105,7 +105,7 @@ $(call _mkdep,lib/,libmtd.a)
+ #
+ obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
+ hashtable/hashtable.o hashtable/hashtable_itr.o
+-LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
++LDLIBS_mkfs.ubifs = -lz $(LZOLDLIBS) -lm -luuid
+ $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
+
+ #
+diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c
+index 4152b6a..244d450 100644
+--- a/mkfs.ubifs/compr.c
++++ b/mkfs.ubifs/compr.c
+@@ -24,7 +24,11 @@
+ #include <stdio.h>
+ #include <stdint.h>
+ #include <string.h>
++#ifndef WITHOUT_LZO
+ #include <lzo/lzo1x.h>
++#else
++#define LZO1X_999_MEM_COMPRESS 0
++#endif
+ #include <linux/types.h>
+
+ #define crc32 __zlib_crc32
+@@ -86,6 +90,8 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf,
+ return 0;
+ }
+
++
++#ifndef WITHOUT_LZO
+ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+ size_t *out_len)
+ {
+@@ -103,6 +109,17 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
+
+ return 0;
+ }
++#else
++static inline int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
++ size_t *out_len)
++{
++ (void)in_buf;
++ (void)in_len;
++ (void)out_buf;
++ (void)out_len;
++ return -1;
++}
++#endif
+
+ static int no_compress(void *in_buf, size_t in_len, void *out_buf,
+ size_t *out_len)
diff --git a/patches/mtd-utils-1.5.0/series b/patches/mtd-utils-1.5.0/series
new file mode 100644
index 0000000..38ac3d1
--- /dev/null
+++ b/patches/mtd-utils-1.5.0/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-make-ubifs-optional.patch
+0002-Make-liblzo-optional-for-ubifs-tools.patch
+# c7b83aac3f84d721cecd9e53605999f9 - git-ptx-patches magic
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 9fa4e5a..d20050e 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils
#
# Paths and names
#
-MTD_UTILS_VERSION := 1.4.9
-MTD_UTILS_MD5 := 82b8e714b90674896570968f70ca778b
+MTD_UTILS_VERSION := 1.5.0
+MTD_UTILS_MD5 := 7332f1143be4ba8ee2de3096cbd3b03b
MTD_UTILS := mtd-utils-$(MTD_UTILS_VERSION)
MTD_UTILS_SUFFIX := tar.bz2
MTD_UTILS_URL := ftp://ftp.infradead.org/pub/mtd-utils/$(MTD_UTILS).$(MTD_UTILS_SUFFIX)
--
1.7.9.5
--
ptxdist mailing list
ptxdist@pengutronix.de
next reply other threads:[~2012-07-23 20:24 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-23 20:24 Bernhard Walle [this message]
2012-07-23 20:28 ` Thomas Petazzoni
2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.5.0 Bernhard Walle
2012-07-24 19:56 ` Michael Olbrich
2012-07-23 20:30 ` [ptxdist] [PATCH] Update mtd-utils to 1.4.9 Bernhard Walle
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 12:02 [ptxdist] [PATCH 1/3] " Bernhard Walle
2012-03-13 12:00 ` [ptxdist] [PATCH] " bernhard
2012-03-13 13:31 ` Michael Olbrich
2012-03-13 13:34 ` Michael Olbrich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1343075057-22209-1-git-send-email-bernhard@bwalle.de \
--to=bernhard@bwalle.de \
--cc=ptxdist@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox