diff options
| author | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-11 16:15:52 +0000 |
|---|---|---|
| committer | Lars-Peter Clausen <lars@metafoo.de> | 2010-01-11 16:15:52 +0000 |
| commit | 8b14d2df0cf87366f16fb50087df6437a08351d6 (patch) | |
| tree | 7b3b3619e7760ddb155b9e1c5297a043d67832aa /tools | |
| parent | 9a1aa9d6c9fda5cd02ee20a6197974385746770a (diff) | |
| download | master-187ad058-8b14d2df0cf87366f16fb50087df6437a08351d6.tar.gz master-187ad058-8b14d2df0cf87366f16fb50087df6437a08351d6.tar.bz2 master-187ad058-8b14d2df0cf87366f16fb50087df6437a08351d6.zip | |
mtd-utils: Don't include lzo headers aswell...
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19107 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mtd-utils/patches/101-ubifs-optional_lzo.patch | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch index 35a7cd86f5..d49c94bb28 100644 --- a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch +++ b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch @@ -15,7 +15,17 @@ diff --git a/mkfs.ubifs/compr.c b/mkfs.ubifs/compr.c index e378c5d..0208f80 100644 --- a/mkfs.ubifs/compr.c +++ b/mkfs.ubifs/compr.c -@@ -83,6 +83,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, +@@ -25,7 +25,9 @@ + #include <stdint.h> + #include <string.h> + #include <zlib.h> ++#if CONFIG_UBIFS_LZO + #include <lzo/lzo1x.h> ++#endif + #include <linux/types.h> + + #include "compr.h" +@@ -83,6 +85,17 @@ static int zlib_deflate(void *in_buf, size_t in_len, void *out_buf, return 0; } @@ -33,7 +43,7 @@ index e378c5d..0208f80 100644 static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, size_t *out_len) { -@@ -101,14 +112,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, +@@ -101,14 +114,16 @@ static int lzo_compress(void *in_buf, size_t in_len, void *out_buf, return 0; } @@ -55,7 +65,7 @@ index e378c5d..0208f80 100644 static char *zlib_buf; static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf, -@@ -195,9 +208,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, +@@ -195,9 +210,11 @@ int compress_data(void *in_buf, size_t in_len, void *out_buf, size_t *out_len, int init_compression(void) { @@ -67,7 +77,7 @@ index e378c5d..0208f80 100644 zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR); if (!zlib_buf) { -@@ -211,7 +226,9 @@ int init_compression(void) +@@ -211,7 +228,9 @@ int init_compression(void) void destroy_compression(void) { free(zlib_buf); |