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/100-optional_lzo.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/100-optional_lzo.patch')
| -rw-r--r-- | tools/mtd-utils/patches/100-optional_lzo.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/tools/mtd-utils/patches/100-optional_lzo.patch b/tools/mtd-utils/patches/100-optional_lzo.patch index 4bd3e5aba7..e69de29bb2 100644 --- a/tools/mtd-utils/patches/100-optional_lzo.patch +++ b/tools/mtd-utils/patches/100-optional_lzo.patch @@ -1,21 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -43,10 +43,15 @@ $(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 $(NO_LZO),,compr_lzo.o) \ - 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 += $(LZOLDFLAGS) -+LDLIBS_mkfs.jffs2 += -llzo2 -+CPPFLAGS += -DCONFIG_JFFS2_LZO -+endif - - $(BUILDDIR)/jffs2reader: $(BUILDDIR)/jffs2reader.o - LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) |