summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Walle <bernhard@bwalle.de>2012-07-23 22:30:11 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-07-24 21:50:06 +0200
commit304d66c3cf9a6b05ade1047e92ec7c0e0ab633d6 (patch)
treef6a46464ce30bd6b1b7d9d1ac7bbbad5d527f601
parent5b6eb7f7e680a2a4400ef0ece6d7fa77ef07e214 (diff)
downloadptxdist-304d66c3cf9a6b05ade1047e92ec7c0e0ab633d6.tar.gz
ptxdist-304d66c3cf9a6b05ade1047e92ec7c0e0ab633d6.tar.xz
Update mtd-utils to 1.5.0
Tested on a beagle board. Signed-off-by: Bernhard Walle <bernhard@bwalle.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch (renamed from patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch)2
-rw-r--r--patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch (renamed from patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch)4
-rw-r--r--patches/mtd-utils-1.5.0/series (renamed from patches/mtd-utils-1.4.9/series)0
-rw-r--r--rules/mtd-utils.make4
4 files changed, 5 insertions, 5 deletions
diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch
index 2cbce0942..2dec433b8 100644
--- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch
+++ b/patches/mtd-utils-1.5.0/0001-make-ubifs-optional.patch
@@ -8,7 +8,7 @@ Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
1 file changed, 2 insertions(+)
diff --git a/Makefile b/Makefile
-index 17a1216..5e1692f 100644
+index f380b42..a682a8f 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,9 @@ UBI_BINS = \
diff --git a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch
index eacff2175..01c36567a 100644
--- a/patches/mtd-utils-1.4.9/0002-Make-liblzo-optional-for-ubifs-tools.patch
+++ b/patches/mtd-utils-1.5.0/0002-Make-liblzo-optional-for-ubifs-tools.patch
@@ -11,10 +11,10 @@ Signed-off-by: Bernhard Walle <bernhard@bwalle.de>
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
-index 000dc86..83eb9ce 100644
+index a682a8f..190db58 100644
--- a/Makefile
+++ b/Makefile
-@@ -103,7 +103,7 @@ $(call _mkdep,lib/,libmtd.a)
+@@ -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
diff --git a/patches/mtd-utils-1.4.9/series b/patches/mtd-utils-1.5.0/series
index 38ac3d1e2..38ac3d1e2 100644
--- a/patches/mtd-utils-1.4.9/series
+++ b/patches/mtd-utils-1.5.0/series
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 9fa4e5a0f..d20050e92 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)