domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/compcache: refresh patches

Browse Source 
SVN-Revision: 20458
This commit is contained in:
Gabor Juhos
2010-03-26 14:28:03 +00:00
parent 7675a3685a
commit 0f0e00e0cb
2 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package/compcache/patches/000-provide_lzo_kmod.patch
View File

@@ -1,6 +1,5 @@
diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile --- a/Makefile
--- compcache-org/Makefile 2010-01-24 17:46:50.000000000 +0100 +++ b/Makefile
+++ compcache-0.6.2/Makefile 2010-03-18 16:00:41.000000000 +0100
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build" KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build"
@@ -20,16 +19,15 @@ diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile
make -C sub-projects/rzscontrol make -C sub-projects/rzscontrol
doc: doc:
@@ -16,5 +19,6 @@ @@ -16,5 +19,6 @@ doc:
clean: clean:
make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean
+ make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean + make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean
make -C sub-projects/rzscontrol clean make -C sub-projects/rzscontrol clean
@rm -rf *.ko @rm -rf *.ko
diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c --- a/ramzswap_drv.c
--- compcache-org/ramzswap_drv.c 2010-01-24 17:52:19.000000000 +0100 +++ b/ramzswap_drv.c
+++ compcache-0.6.2/ramzswap_drv.c 2010-03-18 16:03:23.000000000 +0100
@@ -23,13 +23,13 @@ @@ -23,13 +23,13 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/genhd.h> #include <linux/genhd.h>
@@ -45,9 +43,8 @@ diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c
#include "compat.h" #include "compat.h"
#include "ramzswap_drv.h" #include "ramzswap_drv.h"
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-projects/compression/lzo-kmod/lzo1x.c --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/lzo1x.c
+++ compcache/sub-projects/compression/lzo-kmod/lzo1x.c 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,7 @@ @@ -0,0 +1,7 @@
+#include <linux/module.h> +#include <linux/module.h>
+ +
@@ -56,9 +53,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-
+ +
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZO1X Lib"); +MODULE_DESCRIPTION("LZO1X Lib");
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c
+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,227 @@ @@ -0,0 +1,227 @@
+/* +/*
+ * LZO1X Compressor from MiniLZO + * LZO1X Compressor from MiniLZO
@@ -287,9 +283,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compc
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZO1X-1 Compressor"); +MODULE_DESCRIPTION("LZO1X-1 Compressor");
+ +
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,255 @@ @@ -0,0 +1,255 @@
+/* +/*
+ * LZO1X Decompressor from MiniLZO + * LZO1X Decompressor from MiniLZO
@@ -546,9 +541,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c com
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION("LZO1X Decompressor"); +MODULE_DESCRIPTION("LZO1X Decompressor");
+ +
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/sub-projects/compression/lzo-kmod/lzodefs.h --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/lzodefs.h
+++ compcache/sub-projects/compression/lzo-kmod/lzodefs.h 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,43 @@ @@ -0,0 +1,43 @@
+/* +/*
+ * lzodefs.h -- architecture, OS and compiler specific defines + * lzodefs.h -- architecture, OS and compiler specific defines
@@ -593,9 +587,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/su
+#define DX2(p, s1, s2) (((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \ +#define DX2(p, s1, s2) (((((size_t)((p)[2]) << (s2)) ^ (p)[1]) \
+ << (s1)) ^ (p)[0]) + << (s1)) ^ (p)[0])
+#define DX3(p, s1, s2, s3) ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0]) +#define DX3(p, s1, s2, s3) ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0])
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo.h compcache/sub-projects/compression/lzo-kmod/lzo.h --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/lzo.h 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/lzo.h
+++ compcache/sub-projects/compression/lzo-kmod/lzo.h 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,44 @@ @@ -0,0 +1,44 @@
+#ifndef __LZO_H__ +#ifndef __LZO_H__
+#define __LZO_H__ +#define __LZO_H__
@@ -641,9 +634,8 @@ diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo.h compcache/sub-pr
+#define LZO_E_NOT_YET_IMPLEMENTED (-9) +#define LZO_E_NOT_YET_IMPLEMENTED (-9)
+ +
+#endif +#endif
diff -uNr compcache-old/sub-projects/compression/lzo-kmod/Makefile compcache/sub-projects/compression/lzo-kmod/Makefile --- /dev/null
--- compcache-old/sub-projects/compression/lzo-kmod/Makefile 1970-01-01 01:00:00.000000000 +0100 +++ b/sub-projects/compression/lzo-kmod/Makefile
+++ compcache/sub-projects/compression/lzo-kmod/Makefile 2009-10-17 09:35:59.000000000 +0200
@@ -0,0 +1,8 @@ @@ -0,0 +1,8 @@
+obj-m += lzo1x_compress.o lzo1x_decompress.o +obj-m += lzo1x_compress.o lzo1x_decompress.o
+ +

28
package/compcache/patches/001-lzo-speed.patch
View File

@@ -1,7 +1,6 @@
diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_compress.c --- a/sub-projects/compression/lzo-kmod/lzo1x_compress.c
--- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-04-20 06:28:30.000000000 +0200 +++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c
+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-04-20 06:29:21.000000000 +0200 @@ -62,8 +62,12 @@ _lzo1x_1_do_compress(const unsigned char
@@ -62,8 +62,12 @@
goto literal; goto literal;
try_match: try_match:
@@ -14,7 +13,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
if (likely(m_pos[2] == ip[2])) if (likely(m_pos[2] == ip[2]))
goto match; goto match;
} }
@@ -94,9 +98,14 @@ @@ -94,9 +98,14 @@ match:
} }
*op++ = tt; *op++ = tt;
} }
@@ -32,7 +31,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
} }
ip += 3; ip += 3;
@@ -208,9 +217,14 @@ @@ -208,9 +217,14 @@ int lzo1x_1_compress(const unsigned char
*op++ = tt; *op++ = tt;
} }
@@ -50,15 +49,14 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c
} }
*op++ = M4_MARKER | 1; *op++ = M4_MARKER | 1;
@@ -224,4 +238,3 @@ @@ -224,4 +238,3 @@ EXPORT_SYMBOL_GPL(lzo1x_1_compress);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("LZO1X-1 Compressor"); MODULE_DESCRIPTION("LZO1X-1 Compressor");
- -
diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_decompress.c --- a/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
--- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-04-20 06:28:30.000000000 +0200 +++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c
+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-04-20 06:29:21.000000000 +0200 @@ -45,10 +45,7 @@ int lzo1x_decompress_safe(const unsigned
@@ -45,10 +45,7 @@
goto output_overrun; goto output_overrun;
if (HAVE_IP(t + 1, ip_end, ip)) if (HAVE_IP(t + 1, ip_end, ip))
goto input_overrun; goto input_overrun;
@@ -70,7 +68,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
} }
while ((ip < ip_end)) { while ((ip < ip_end)) {
@@ -71,30 +68,27 @@ @@ -71,30 +68,27 @@ int lzo1x_decompress_safe(const unsigned
if (HAVE_IP(t + 4, ip_end, ip)) if (HAVE_IP(t + 4, ip_end, ip))
goto input_overrun; goto input_overrun;
@@ -116,7 +114,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
t = *ip++; t = *ip++;
if (t >= 16) if (t >= 16)
goto match; goto match;
@@ -139,8 +133,7 @@ @@ -139,8 +133,7 @@ match:
t += 31 + *ip++; t += 31 + *ip++;
} }
m_pos = op - 1; m_pos = op - 1;
@@ -126,7 +124,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
ip += 2; ip += 2;
} else if (t >= 16) { } else if (t >= 16) {
m_pos = op; m_pos = op;
@@ -158,8 +151,7 @@ @@ -158,8 +151,7 @@ match:
} }
t += 7 + *ip++; t += 7 + *ip++;
} }
@@ -136,7 +134,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress
ip += 2; ip += 2;
if (m_pos == op) if (m_pos == op)
goto eof_found; goto eof_found;
@@ -184,21 +176,33 @@ @@ -184,21 +176,33 @@ match:
if (HAVE_OP(t + 3 - 1, op_end, op)) if (HAVE_OP(t + 3 - 1, op_end, op))
goto output_overrun; goto output_overrun;