diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-03-01 19:55:48 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-03-01 19:55:48 +0000 |
| commit | 3698c6a3913d7db608475047ddf7a0e42936e7ba (patch) | |
| tree | 50bf7127760f0b8a50449f76eb0b26b1176a99a5 /tools/mtd-utils/patches/130-lzma_jffs2.patch | |
| parent | 705284797218b347ac67a73f0477ff75ed5ede56 (diff) | |
| download | upstream-3698c6a3913d7db608475047ddf7a0e42936e7ba.tar.gz upstream-3698c6a3913d7db608475047ddf7a0e42936e7ba.tar.bz2 upstream-3698c6a3913d7db608475047ddf7a0e42936e7ba.zip | |
tools/mtd-utils: update to 1.4.5
This updates mtd-utils in tools:
100-optional_lzo.patch and 101-ubifs-optional_lzo.patch
are now uneeded as a WITHOUT_LZO flag is provided by the
upstream sources. All remaining patches are refreshed
for the new version.
135-mkubifs_optional_lzo.patch was created to respect
WITHOUT_LZO also in mkubifs.
Signed-off-by: Daniel Golle <dgolle@allnet.de>
SVN-Revision: 30769
Diffstat (limited to 'tools/mtd-utils/patches/130-lzma_jffs2.patch')
| -rw-r--r-- | tools/mtd-utils/patches/130-lzma_jffs2.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/mtd-utils/patches/130-lzma_jffs2.patch b/tools/mtd-utils/patches/130-lzma_jffs2.patch index f869118fc4..be1c361fe1 100644 --- 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; |