diff options
author | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-26 14:28:03 +0000 |
---|---|---|
committer | juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-26 14:28:03 +0000 |
commit | 18c4a994f3d2e25c0c26a49603551840ce420db9 (patch) | |
tree | 649f6b78e9d6e6c802e0bcdafb95cfd35fdff358 | |
parent | d7b4feb3ee17625e4bec27774aff47a183aac352 (diff) |
package/compcache: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20458 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/compcache/patches/000-provide_lzo_kmod.patch | 42 | ||||
-rw-r--r-- | package/compcache/patches/001-lzo-speed.patch | 28 |
2 files changed, 30 insertions, 40 deletions
diff --git a/package/compcache/patches/000-provide_lzo_kmod.patch b/package/compcache/patches/000-provide_lzo_kmod.patch index 369bc1feb..1dab08507 100644 --- a/package/compcache/patches/000-provide_lzo_kmod.patch +++ b/package/compcache/patches/000-provide_lzo_kmod.patch @@ -1,6 +1,5 @@ -diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile ---- compcache-org/Makefile 2010-01-24 17:46:50.000000000 +0100 -+++ compcache-0.6.2/Makefile 2010-03-18 16:00:41.000000000 +0100 +--- a/Makefile ++++ b/Makefile @@ -1,14 +1,17 @@ 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 doc: -@@ -16,5 +19,6 @@ +@@ -16,5 +19,6 @@ doc: clean: make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean + make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean make -C sub-projects/rzscontrol clean @rm -rf *.ko -diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c ---- compcache-org/ramzswap_drv.c 2010-01-24 17:52:19.000000000 +0100 -+++ compcache-0.6.2/ramzswap_drv.c 2010-03-18 16:03:23.000000000 +0100 +--- a/ramzswap_drv.c ++++ b/ramzswap_drv.c @@ -23,13 +23,13 @@ #include <linux/device.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 "ramzswap_drv.h" -diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-projects/compression/lzo-kmod/lzo1x.c ---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/lzo1x.c 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/lzo1x.c @@ -0,0 +1,7 @@ +#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_DESCRIPTION("LZO1X Lib"); -diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c ---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c @@ -0,0 +1,227 @@ +/* + * 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_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 ---- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c @@ -0,0 +1,255 @@ +/* + * 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_DESCRIPTION("LZO1X Decompressor"); + -diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/sub-projects/compression/lzo-kmod/lzodefs.h ---- compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/lzodefs.h 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/lzodefs.h @@ -0,0 +1,43 @@ +/* + * 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]) \ + << (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 ---- compcache-old/sub-projects/compression/lzo-kmod/lzo.h 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/lzo.h 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/lzo.h @@ -0,0 +1,44 @@ +#ifndef __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) + +#endif -diff -uNr compcache-old/sub-projects/compression/lzo-kmod/Makefile compcache/sub-projects/compression/lzo-kmod/Makefile ---- compcache-old/sub-projects/compression/lzo-kmod/Makefile 1970-01-01 01:00:00.000000000 +0100 -+++ compcache/sub-projects/compression/lzo-kmod/Makefile 2009-10-17 09:35:59.000000000 +0200 +--- /dev/null ++++ b/sub-projects/compression/lzo-kmod/Makefile @@ -0,0 +1,8 @@ +obj-m += lzo1x_compress.o lzo1x_decompress.o + diff --git a/package/compcache/patches/001-lzo-speed.patch b/package/compcache/patches/001-lzo-speed.patch index 59efe097c..130f79da6 100644 --- a/package/compcache/patches/001-lzo-speed.patch +++ b/package/compcache/patches/001-lzo-speed.patch @@ -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 ---- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-04-20 06:28:30.000000000 +0200 -+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-04-20 06:29:21.000000000 +0200 -@@ -62,8 +62,12 @@ +--- a/sub-projects/compression/lzo-kmod/lzo1x_compress.c ++++ b/sub-projects/compression/lzo-kmod/lzo1x_compress.c +@@ -62,8 +62,12 @@ _lzo1x_1_do_compress(const unsigned char goto literal; 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])) goto match; } -@@ -94,9 +98,14 @@ +@@ -94,9 +98,14 @@ match: } *op++ = tt; } @@ -32,7 +31,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_compress.c } ip += 3; -@@ -208,9 +217,14 @@ +@@ -208,9 +217,14 @@ int lzo1x_1_compress(const unsigned char *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; -@@ -224,4 +238,3 @@ +@@ -224,4 +238,3 @@ EXPORT_SYMBOL_GPL(lzo1x_1_compress); MODULE_LICENSE("GPL"); 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 ---- compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-04-20 06:28:30.000000000 +0200 -+++ compcache-0.5.3/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-04-20 06:29:21.000000000 +0200 -@@ -45,10 +45,7 @@ +--- a/sub-projects/compression/lzo-kmod/lzo1x_decompress.c ++++ b/sub-projects/compression/lzo-kmod/lzo1x_decompress.c +@@ -45,10 +45,7 @@ int lzo1x_decompress_safe(const unsigned goto output_overrun; if (HAVE_IP(t + 1, ip_end, ip)) 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)) { -@@ -71,30 +68,27 @@ +@@ -71,30 +68,27 @@ int lzo1x_decompress_safe(const unsigned if (HAVE_IP(t + 4, ip_end, ip)) goto input_overrun; @@ -116,7 +114,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress t = *ip++; if (t >= 16) goto match; -@@ -139,8 +133,7 @@ +@@ -139,8 +133,7 @@ match: t += 31 + *ip++; } m_pos = op - 1; @@ -126,7 +124,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress ip += 2; } else if (t >= 16) { m_pos = op; -@@ -158,8 +151,7 @@ +@@ -158,8 +151,7 @@ match: } t += 7 + *ip++; } @@ -136,7 +134,7 @@ diff -uNr compcache-0.5.3-org/sub-projects/compression/lzo-kmod/lzo1x_decompress ip += 2; if (m_pos == op) goto eof_found; -@@ -184,21 +176,33 @@ +@@ -184,21 +176,33 @@ match: if (HAVE_OP(t + 3 - 1, op_end, op)) goto output_overrun; |