diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-03 21:29:17 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-08-03 21:29:38 +0200 |
| commit | e1f6cd1ad94002decf9c30671594c40e313c8217 (patch) | |
| tree | ed4e7a983f64c3e5fe9174aa0e2bc9fa68a340bc | |
| parent | 041f3d86323acaf8a88e4a58db04fc45987efdbf (diff) | |
| download | ptxdist-e1f6cd1ad94002decf9c30671594c40e313c8217.tar.gz ptxdist-e1f6cd1ad94002decf9c30671594c40e313c8217.tar.xz | |
[mtd-utils] regenerate patches
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch (renamed from patches/mtd-utils-1.3.1/make-liblzo-optional.patch) | 7 | ||||
| -rw-r--r-- | patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch (renamed from patches/mtd-utils-1.3.1/make-mkubifs-optional.patch) | 13 | ||||
| -rw-r--r-- | patches/mtd-utils-1.3.1/series | 6 |
3 files changed, 16 insertions, 10 deletions
diff --git a/patches/mtd-utils-1.3.1/make-liblzo-optional.patch b/patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch index 8778956d4..e5f6f6eab 100644 --- a/patches/mtd-utils-1.3.1/make-liblzo-optional.patch +++ b/patches/mtd-utils-1.3.1/0001-make-liblzo-optional.patch @@ -1,4 +1,3 @@ -From 76e3b58f84aeeff3be23f19774ee047babbfa539 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde <mkl@pengutronix.de> Date: Mon, 20 Jul 2009 19:37:09 +0200 Subject: [PATCH] make liblzo optional @@ -60,10 +59,10 @@ index 51bf0dd..f373fb6 100644 #define JFFS2_RUBINMIPS_PRIORITY 10 #define JFFS2_DYNRUBIN_PRIORITY 20 diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile -index a678b0a..d4d897f 100644 +index 61d0e20..870cf81 100644 --- a/mkfs.ubifs/Makefile +++ b/mkfs.ubifs/Makefile -@@ -6,7 +6,11 @@ +@@ -6,7 +6,11 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch] TARGETS = mkfs.ubifs @@ -120,5 +119,5 @@ index e378c5d..55ed1b6 100644 static int no_compress(void *in_buf, size_t in_len, void *out_buf, size_t *out_len) -- -1.6.3.3 +1.7.1 diff --git a/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch b/patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch index ec99f13c1..707b677ac 100644 --- a/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch +++ b/patches/mtd-utils-1.3.1/0002-make-mkubifs-optional.patch @@ -5,11 +5,13 @@ Subject: [PATCH] make mkubifs optional Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + 1 files changed, 5 insertions(+), 1 deletions(-) ---- a/Makefile 2010-08-03 14:55:20.000000000 +0200 -+++ b/Makefile 2010-08-03 14:24:39.000000000 +0200 -@@ -11,7 +11,11 @@ +diff --git a/Makefile b/Makefile +index 5de9382..462a8f9 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,11 @@ ifeq ($(WITHOUT_LZO), 1) CPPFLAGS += -DWITHOUT_LZO endif @@ -22,3 +24,6 @@ Signed-off-by: Ladislav Michl <ladis@linux-mips.org> TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \ ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \ +-- +1.7.1 + diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series index 44806a8aa..0a25eaa20 100644 --- a/patches/mtd-utils-1.3.1/series +++ b/patches/mtd-utils-1.3.1/series @@ -1,2 +1,4 @@ -make-liblzo-optional.patch -make-mkubifs-optional.patch +# generated by git-ptx-patches +0001-make-liblzo-optional.patch +0002-make-mkubifs-optional.patch +# de3de5f0066fdb617068740421812da6 - git-ptx-patches magic |