[x86] bump to 2.6.39.4

[openwrt.git] / 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
index d9ebc3e..4bd3e5a 100644 (file)
--- a/tools/mtd-utils/patches/100-optional_lzo.patch
+++ b/tools/mtd-utils/patches/100-optional_lzo.patch
@@ -1,15 +1,14 @@
 --- a/Makefile
 +++ b/Makefile
 --- a/Makefile
 +++ b/Makefile

-@@ -36,10 +36,16 @@ $(SYMLINKS):
+@@ -43,10 +43,15 @@ $(SYMLINKS):

        ln -sf ../fs/jffs2/$@ $@
  
  $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\
        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_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.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
        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 := $(ZLIBLDFLAGS)
 +LDLIBS_mkfs.jffs2  := -lz
 +ifndef NO_LZO


@@ -18,15 +17,5 @@
 +CPPFLAGS += -DCONFIG_JFFS2_LZO
 +endif
  
 +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
+ $(BUILDDIR)/jffs2reader: $(BUILDDIR)/jffs2reader.o
+ LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)