diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:25:30 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-05-26 09:25:30 +0000 |
| commit | df23709f165b2e74e398080f1c0706d011263412 (patch) | |
| tree | 1bbf1d4e62b578079cdbf955f01c34c337afe837 /tools/mtd-utils/patches/130-lzma_jffs2.patch | |
| parent | a621b8c28404c402cf4b42e9b0b28a76b98fae0e (diff) | |
| download | mtk-20170518-df23709f165b2e74e398080f1c0706d011263412.zip mtk-20170518-df23709f165b2e74e398080f1c0706d011263412.tar.gz mtk-20170518-df23709f165b2e74e398080f1c0706d011263412.tar.bz2 | |
tools/mtd-utils: upgrade to latest git
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 45760
Diffstat (limited to 'tools/mtd-utils/patches/130-lzma_jffs2.patch')
| -rw-r--r-- | tools/mtd-utils/patches/130-lzma_jffs2.patch | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch index be1c361..17f9978 100644 --- a/tools/mtd-utils/patches/130-lzma_jffs2.patch +++ b/tools/mtd-utils/patches/130-lzma_jffs2.patch @@ -1,25 +1,24 @@ --- a/Makefile +++ b/Makefile -@@ -1,7 +1,7 @@ +@@ -4,6 +4,7 @@ + VERSION = 1.5.1 - # -*- sh -*- - --CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -+CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) -I./include/linux/lzma + CPPFLAGS += -D_GNU_SOURCE -I./include -I$(BUILDDIR)/include -I./ubi-utils/include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) $(UUIDCPPFLAGS) ++CPPFLAGS += -I./include/linux/lzma ifeq ($(WITHOUT_XATTR), 1) CPPFLAGS += -DWITHOUT_XATTR -@@ -59,7 +59,9 @@ $(SYMLINKS): - ln -sf ../fs/jffs2/$@ $@ - - $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ -- compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ -+ compr_rtime.o mkfs.jffs2.o compr_zlib.o \ -+ $(if $(WITHOUT_LZO),,compr_lzo.o) \ +@@ -84,7 +85,9 @@ $(BUILDDIR)/include/version.h.tmp: + # + # Utils in top level + # +-obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr_lzo.o compr.o rbtree.o ++obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o $(if $(WITHOUT_LZO),,compr_lzo.o)\ + compr_lzma.o lzma/LzFind.o lzma/LzmaEnc.o lzma/LzmaDec.o \ - compr.o rbtree.o) ++ compr.o rbtree.o 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 +5012,7 @@ +} --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c -@@ -1685,11 +1685,11 @@ int main(int argc, char **argv) +@@ -1659,11 +1659,11 @@ int main(int argc, char **argv) } erase_block_size *= units; |