tools: mtd-utils: Update to version 2.1.4

[openwrt/staging/nbd.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 9778aa6d0adb56c47a1a0893948d3dfd7d2a7e80..55930ddc861ccde8635e9d757d640e66de3f06cf 100644 (file)
--- a/tools/mtd-utils/patches/130-lzma_jffs2.patch
+++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch
@@ -1,6 +1,6 @@
 --- a/jffsX-utils/Makemodule.am
 +++ b/jffsX-utils/Makemodule.am
-@@ -4,11 +4,19 @@ mkfs_jffs2_SOURCES = \
+@@ -4,7 +4,10 @@ mkfs_jffs2_SOURCES = \
        jffsX-utils/compr_zlib.c \
        jffsX-utils/compr.h \
        jffsX-utils/rbtree.c \
@@ -10,7 +10,12 @@
 +      jffsX-utils/lzma/LzmaEnc.c \
 +      jffsX-utils/lzma/LzmaDec.c \
        jffsX-utils/compr.c \
-       jffsX-utils/compr_rtime.c
+       jffsX-utils/compr_rtime.c \
+       jffsX-utils/compr.h \
+@@ -12,8 +15,13 @@ mkfs_jffs2_SOURCES = \
+       jffsX-utils/summary.h \
+       include/linux/jffs2.h \
+       include/mtd/jffs2-user.h
 +
 +if !WITHOUT_LZO
 +mkfs_jffs2_SOURCES += jffsX-utils/compr_lzo.c
@@ -20,7 +25,7 @@
 -mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS)
 +mkfs_jffs2_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) -I./include/linux/lzma
  
- jffs2reader_SOURCES = jffsX-utils/jffs2reader.c
+ jffs2reader_SOURCES = jffsX-utils/jffs2reader.c       include/mtd/jffs2-user.h
  jffs2reader_LDADD = libmtd.a $(ZLIB_LIBS) $(LZO_LIBS)
 --- a/jffsX-utils/compr.c
 +++ b/jffsX-utils/compr.c