From 9f28e5bd03c15cbb0f9b1c534d16e065127aaeb2 Mon Sep 17 00:00:00 2001 From: nbd Date: Sun, 14 Jun 2009 20:42:12 +0000 Subject: upgrade to a more recent version of mtd-utils - preparation for adding UBI support git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16455 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- tools/mtd-utils/patches/100-optional_lzo.patch | 32 ++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 tools/mtd-utils/patches/100-optional_lzo.patch (limited to 'tools/mtd-utils/patches/100-optional_lzo.patch') diff --git a/tools/mtd-utils/patches/100-optional_lzo.patch b/tools/mtd-utils/patches/100-optional_lzo.patch new file mode 100644 index 000000000..d9ebc3e9b --- /dev/null +++ b/tools/mtd-utils/patches/100-optional_lzo.patch @@ -0,0 +1,32 @@ +--- a/Makefile ++++ b/Makefile +@@ -36,10 +36,16 @@ $(SYMLINKS): + ln -sf ../fs/jffs2/$@ $@ + + $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ +- crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ ++ crc32.o compr_rtime.o mkfs.jffs2.o compr_zlib.o $(if $(NO_LZO),,compr_lzo.o) \ + compr.o rbtree.o) +-LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) +-LDLIBS_mkfs.jffs2 = -lz -llzo2 ++ ++LDFLAGS_mkfs.jffs2 := $(ZLIBLDFLAGS) ++LDLIBS_mkfs.jffs2 := -lz ++ifndef NO_LZO ++LDFLAGS_mkfs.jffs2 += $(LZOLDFLAGS) ++LDLIBS_mkfs.jffs2 += -llzo2 ++CPPFLAGS += -DCONFIG_JFFS2_LZO ++endif + + $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o + +--- a/compr.h ++++ b/compr.h +@@ -18,7 +18,6 @@ + + #define CONFIG_JFFS2_ZLIB + #define CONFIG_JFFS2_RTIME +-#define CONFIG_JFFS2_LZO + + #define JFFS2_RUBINMIPS_PRIORITY 10 + #define JFFS2_DYNRUBIN_PRIORITY 20 -- cgit v1.2.3