X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f55c08db991c8d530fee53c06a51a84c9348bf57..ce970904106bde982c02d4c6848e0743f8e0fd13:/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch

diff --git a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
index 9f797e01b..e69de29bb 100644
--- a/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
+++ b/tools/mtd-utils/patches/101-ubifs-optional_lzo.patch
@@ -1,88 +0,0 @@
-diff --git a/mkfs.ubifs/Makefile b/mkfs.ubifs/Makefile
-index a678b0a..919ce89 100644
---- a/mkfs.ubifs/Makefile
-+++ b/mkfs.ubifs/Makefile
-@@ -6,7 +6,7 @@ ALL_SOURCES=*.[ch] hashtable/*.[ch]
- 
- TARGETS = mkfs.ubifs
- 
--LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
-+LDLIBS_mkfs.ubifs = -lz $(if,$(NO_LZO),,-llzo2) -lm -luuid -L$(BUILDDIR)/../ubi-utils/ -lubi
- LDLIBS_mkfs.ubifs += -L$(BUILDDIR)/../lib -lmtd -lcrc32
- LDLIBS_mkfs.ubifs += $(ZLIBLDFLAGS) $(LZOLDFLAGS)
- 
-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
-@@ -24,7 +24,9 @@
- #include <stdio.h>
- #include <stdint.h>
- #include <string.h>
-+#if CONFIG_UBIFS_LZO
- #include <lzo/lzo1x.h>
-+#endif
- #include <linux/types.h>
- 
- #define crc32 __zlib_crc32
-@@ -85,6 +87,16 @@ static int zlib_deflate(void *in_buf, si
- 	return 0;
- }
- 
-+static int no_compress(void *in_buf, size_t in_len, void *out_buf,
-+			size_t *out_len)
-+{
-+	memcpy(out_buf, in_buf, in_len);
-+	*out_len = in_len;
-+	return 0;
-+}
-+
-+#if CONFIG_UBIFS_LZO
-+
- static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
- 			size_t *out_len)
- {
-@@ -103,14 +115,16 @@ static int lzo_compress(void *in_buf, si
- 	return 0;
- }
- 
--static int no_compress(void *in_buf, size_t in_len, void *out_buf,
--		       size_t *out_len)
-+#else
-+
-+static int lzo_compress(void *in_buf, size_t in_len, void *out_buf,
-+			size_t *out_len)
- {
--	memcpy(out_buf, in_buf, in_len);
--	*out_len = in_len;
--	return 0;
-+	return 1;
- }
- 
-+#endif
-+
- static char *zlib_buf;
- 
- static int favor_lzo_compress(void *in_buf, size_t in_len, void *out_buf,
-@@ -197,9 +211,11 @@ int compress_data(void *in_buf, size_t i
- 
- int init_compression(void)
- {
-+#ifdef CONFIG_UBIFS_LZO
- 	lzo_mem = malloc(LZO1X_999_MEM_COMPRESS);
- 	if (!lzo_mem)
- 		return -1;
-+#endif
- 
- 	zlib_buf = malloc(UBIFS_BLOCK_SIZE * WORST_COMPR_FACTOR);
- 	if (!zlib_buf) {
-@@ -213,7 +229,9 @@ int init_compression(void)
- void destroy_compression(void)
- {
- 	free(zlib_buf);
-+#ifdef CONFIG_UBIFS_LZO
- 	free(lzo_mem);
-+#endif
- 	if (errcnt)
- 		fprintf(stderr, "%llu compression errors occurred\n", errcnt);
- }