aboutsummaryrefslogtreecommitdiffstats
path: root/tools/mtd-utils/patches/130-lzma_jffs2.patch
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2010-09-13 18:50:41 +0000
committerJo-Philipp Wich <jow@openwrt.org>2010-09-13 18:50:41 +0000
commit97a286cb62475a3dce30c2c69d1248f0b98288c4 (patch)
tree7196b6bac83eeae36d8f439aa28ef62d629bc26c /tools/mtd-utils/patches/130-lzma_jffs2.patch
parent7ec18378a75ed98f1a1cc389aca51446bb85eae6 (diff)
downloadupstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.tar.gz
upstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.tar.bz2
upstream-97a286cb62475a3dce30c2c69d1248f0b98288c4.zip
revert r23048 for now until Darwin compile issues have been sorted out (#7934)
SVN-Revision: 23057
Diffstat (limited to 'tools/mtd-utils/patches/130-lzma_jffs2.patch')
-rw-r--r--tools/mtd-utils/patches/130-lzma_jffs2.patch17
1 files changed, 8 insertions, 9 deletions
diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index d75ad31397..0f2b8af561 100644
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -1,5 +1,5 @@
--- a/Makefile
-+++ b/Makefile
++++ b/Makefile
@@ -1,7 +1,7 @@
# -*- sh -*-
@@ -9,17 +9,17 @@
ifeq ($(WITHOUT_XATTR), 1)
CPPFLAGS += -DWITHOUT_XATTR
-@@ -51,7 +51,9 @@ $(SYMLINKS):
+@@ -45,7 +45,9 @@
ln -sf ../fs/jffs2/$@ $@
$(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\
-- compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \
-+ compr_rtime.o mkfs.jffs2.o compr_zlib.o \
+- crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \
++ crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o \
+ $(if $(NO_LZO),,compr_lzo.o) \
-+ compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \
++ compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o\
compr.o rbtree.o)
+
LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS)
- LDLIBS_mkfs.jffs2 := -lz
--- a/compr.c 2009-06-05 16:59:08.000000000 +0200
+++ b/compr.c 2010-03-20 23:16:14.556367000 +0100
@@ -520,6 +520,9 @@
@@ -43,11 +43,10 @@
}
--- a/compr.h 2010-03-20 23:08:46.289595000 +0100
+++ b/compr.h 2010-03-20 23:51:41.953345921 +0100
-@@ -18,13 +18,14 @@
+@@ -18,12 +18,14 @@
#define CONFIG_JFFS2_ZLIB
#define CONFIG_JFFS2_RTIME
--#define CONFIG_JFFS2_LZO
+#define CONFIG_JFFS2_LZMA
#define JFFS2_RUBINMIPS_PRIORITY 10
@@ -61,7 +60,7 @@
#define JFFS2_COMPR_MODE_NONE 0
#define JFFS2_COMPR_MODE_PRIORITY 1
-@@ -115,5 +116,10 @@ void jffs2_rtime_exit(void);
+@@ -114,5 +116,10 @@
int jffs2_lzo_init(void);
void jffs2_lzo_exit(void);
#endif