[orion] generic: use magic_long in sysupgrade

[openwrt.git] / tools / mtd-utils / patches / 130-lzma_jffs2.patch

diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch
index f869118..be1c361 100644 (file)
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -9,17 +9,17 @@
  
  ifeq ($(WITHOUT_XATTR), 1)
    CPPFLAGS += -DWITHOUT_XATTR
-@@ -52,7 +52,9 @@ $(SYMLINKS):
+@@ -59,7 +59,9 @@ $(SYMLINKS):
        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 compr_lzo.o \
 +      compr_rtime.o mkfs.jffs2.o compr_zlib.o \
-+      $(if $(NO_LZO),,compr_lzo.o) \
++      $(if $(WITHOUT_LZO),,compr_lzo.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
+ LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
+ LDLIBS_mkfs.jffs2  = -lz $(LZOLDLIBS)
 --- a/compr.c
 +++ b/compr.c
 @@ -520,6 +520,9 @@ int jffs2_compressors_init(void)
@@ -5013,7 +5013,7 @@
 +}
 --- a/mkfs.jffs2.c
 +++ b/mkfs.jffs2.c
-@@ -1684,11 +1684,11 @@ int main(int argc, char **argv)
+@@ -1685,11 +1685,11 @@ int main(int argc, char **argv)
                                                  }
                                                  erase_block_size *= units;