Changeset 20303
- Timestamp:
- 2010-03-19T17:34:41+01:00 (8 years ago)
- Location:
- trunk/package/compcache
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/package/compcache/Makefile
r19981 r20303 11 11 12 12 PKG_NAME:=compcache 13 PKG_VERSION:=0. 5.413 PKG_VERSION:=0.6.2 14 14 PKG_RELEASE:=$(PKG_VERSION)-1 15 15 PKG_SOURCE_URL:=http://compcache.googlecode.com/files/ 16 PKG_MD5SUM:= e83535925a014ac34e1eaeb4f7a2f49a16 PKG_MD5SUM:=27aec78dc50e34fb800c74e879057743 17 17 18 18 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz … … 26 26 VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) 27 27 FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \ 28 $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) \ 29 $(PKG_BUILD_DIR)/sub-projects/allocators/xvmalloc-kmod/xvmalloc.$(LINUX_KMOD_SUFFIX) 28 $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) 30 29 endef 30 31 31 32 32 include $(INCLUDE_DIR)/kernel-defaults.mk 33 33 34 XVM = sub-projects/allocators/xvmalloc-kmod35 34 LZO = sub-projects/compression/lzo-kmod 35 RZSC = sub-projects/rzscontrol 36 36 37 BUILDFLAGS:=-DCONFIG_BLK_DEV_RAMZSWAP_STATS \ 38 -I$(PKG_BUILD_DIR)/$(XVM) \ 37 BUILDFLAGS:=-DCONFIG_RAMZSWAP_STATS \ 39 38 -I$(PKG_BUILD_DIR)/$(LZO) \ 40 -g -Wall 39 -Wall 40 41 RZSCFLAGS:=-I$(PKG_BUILD_DIR)/$(RZSC)/../include \ 42 -I$(PKG_BUILD_DIR)/$(RZSC)/../.. 41 43 42 44 define Build/Compile 43 45 $(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="$(BUILDFLAGS)" M="$(PKG_BUILD_DIR)" modules 46 $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol 44 47 endef 45 48 … … 53 56 $(INSTALL_DIR) $(1)/etc/init.d 54 57 $(INSTALL_BIN) ./files/compcache.init $(1)/etc/init.d/compcache 58 $(INSTALL_DIR) $(1)/sbin 59 $(INSTALL_BIN) $(PKG_BUILD_DIR)/rzscontrol $(1)/sbin/rzscontrol 55 60 endef 56 61 -
trunk/package/compcache/files/compcache.init
r18512 r20303 19 19 fi 20 20 if [ "`lsmod | grep 'ramzswap'`" == "" ]; then 21 insmod xvmalloc22 21 insmod lzo1x 23 22 insmod ramzswap $params_set … … 35 34 [ "`lsmod | grep 'ramzswap'`" != "" ] && rmmod ramzswap &> /dev/null 36 35 [ "`lsmod | grep 'lzo1x'`" != "" ] && rmmod lzo1x &> /dev/null 37 [ "`lsmod | grep 'xvmalloc'`" != "" ] && rmmod xvmalloc &> /dev/null38 36 fi 39 37 } -
trunk/package/compcache/patches/000-provide_lzo_kmod.patch
r18512 r20303 1 diff -uNr compcache- 0.5.4-old/Makefile compcache-0.5.4/Makefile2 --- compcache- 0.5.4-old/Makefile 2009-10-17 08:49:42.000000000 +02003 +++ compcache-0. 5.4/Makefile 2009-10-17 09:39:34.000000000 +02004 @@ -1,1 9 +1,26@@1 diff -uNr compcache-org/Makefile compcache-0.6.2/Makefile 2 --- compcache-org/Makefile 2010-01-24 17:46:50.000000000 +0100 3 +++ compcache-0.6.2/Makefile 2010-03-18 16:00:41.000000000 +0100 4 @@ -1,14 +1,17 @@ 5 5 KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build" 6 6 7 7 XVM = sub-projects/allocators/xvmalloc-kmod 8 -EXTRA_CFLAGS := -DCONFIG_BLK_DEV_RAMZSWAP_STATS \9 - -I$(PWD)/$(XVM) \10 8 +LZO = sub-projects/compression/lzo-kmod 11 + 12 +EXTRA_CFLAGS += -DCONFIG_BLK_DEV_RAMZSWAP_STATS \ 13 + -I$(PWD)/$(XVM) \ 14 + -I$(PWD)/$(LZO) \ 15 -g -Wall 9 EXTRA_CFLAGS := -DCONFIG_RAMZSWAP_STATS \ 10 -Wall 16 11 17 obj-m += $(XVM)/xvmalloc.o \ 18 + $(LZO)/lzo1x.o \ 19 ramzswap.o 12 -obj-m += ramzswap.o 13 +obj-m += ramzswap.o $(LZO)/lzo1x.o 14 ramzswap-objs := ramzswap_drv.o $(XVM)/xvmalloc.o 15 + 20 16 21 17 all: 22 make -C $(KERNEL_BUILD_PATH) M=$(PWD) /$(XVM)modules18 make -C $(KERNEL_BUILD_PATH) M=$(PWD) modules 23 19 + make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) modules 24 make -C $(KERNEL_BUILD_PATH) M=$(PWD) modules 25 @ln -sf $(XVM)/xvmalloc.ko 26 + @ln -sf $(LZO)/xvmalloc.ko 20 make -C sub-projects/rzscontrol 21 22 doc: 23 @@ -16,5 +19,6 @@ 27 24 28 25 clean: 29 26 make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean 30 make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(XVM) clean31 27 + make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean 28 make -C sub-projects/rzscontrol clean 32 29 @rm -rf *.ko 33 diff -uNr compcache- 0.5.4-old/ramzswap.c compcache-0.5.4/ramzswap.c34 --- compcache- 0.5.4-old/ramzswap.c 2009-10-17 08:50:06.000000000 +020035 +++ compcache-0. 5.4/ramzswap.c 2009-10-17 09:35:59.000000000 +020036 @@ -2 0,7 +20,6@@30 diff -uNr compcache-org/ramzswap_drv.c compcache-0.6.2/ramzswap_drv.c 31 --- compcache-org/ramzswap_drv.c 2010-01-24 17:52:19.000000000 +0100 32 +++ compcache-0.6.2/ramzswap_drv.c 2010-03-18 16:03:23.000000000 +0100 33 @@ -23,13 +23,13 @@ 37 34 #include <linux/device.h> 38 35 #include <linux/genhd.h> 39 36 #include <linux/highmem.h> 40 37 -#include <linux/lzo.h> 41 #include <linux/mutex.h>42 #include <linux/proc_fs.h>43 38 #include <linux/string.h> 44 diff -uNr compcache-0.5.4-old/ramzswap.h compcache-0.5.4/ramzswap.h 45 --- compcache-0.5.4-old/ramzswap.h 2009-10-17 08:50:06.000000000 +0200 46 +++ compcache-0.5.4/ramzswap.h 2009-10-17 09:40:45.000000000 +0200 47 @@ -16,6 +16,7 @@ 48 #define _RAMZSWAP_H_ 39 #include <linux/swap.h> 40 #include <linux/swapops.h> 41 #include <linux/vmalloc.h> 42 #include <linux/version.h> 49 43 50 #include "xvmalloc.h"51 44 +#include "lzo.h" 45 #include "compat.h" 46 #include "ramzswap_drv.h" 52 47 53 /* 54 * Stored at beginning of each compressed object. 55 diff -uNr compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x.c 56 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x.c 1970-01-01 01:00:00.000000000 +0100 57 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x.c 2009-10-17 09:35:59.000000000 +0200 48 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c compcache/sub-projects/compression/lzo-kmod/lzo1x.c 49 --- compcache-old/sub-projects/compression/lzo-kmod/lzo1x.c 1970-01-01 01:00:00.000000000 +0100 50 +++ compcache/sub-projects/compression/lzo-kmod/lzo1x.c 2009-10-17 09:35:59.000000000 +0200 58 51 @@ -0,0 +1,7 @@ 59 52 +#include <linux/module.h> … … 64 57 +MODULE_LICENSE("GPL"); 65 58 +MODULE_DESCRIPTION("LZO1X Lib"); 66 diff -uNr compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x_compress.c67 --- compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c 1970-01-01 01:00:00.000000000 +010068 +++ compcache -0.5.4/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-10-17 09:35:59.000000000 +020059 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c 60 --- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c 1970-01-01 01:00:00.000000000 +0100 61 +++ compcache/sub-projects/compression/lzo-kmod/lzo1x_compress.c 2009-10-17 09:35:59.000000000 +0200 69 62 @@ -0,0 +1,227 @@ 70 63 +/* … … 295 288 +MODULE_DESCRIPTION("LZO1X-1 Compressor"); 296 289 + 297 diff -uNr compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x_decompress.c298 --- compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 1970-01-01 01:00:00.000000000 +0100299 +++ compcache -0.5.4/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-10-17 09:35:59.000000000 +0200290 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 291 --- compcache-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 1970-01-01 01:00:00.000000000 +0100 292 +++ compcache/sub-projects/compression/lzo-kmod/lzo1x_decompress.c 2009-10-17 09:35:59.000000000 +0200 300 293 @@ -0,0 +1,255 @@ 301 294 +/* … … 554 547 +MODULE_DESCRIPTION("LZO1X Decompressor"); 555 548 + 556 diff -uNr compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache-0.5.4/sub-projects/compression/lzo-kmod/lzodefs.h557 --- compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzodefs.h 1970-01-01 01:00:00.000000000 +0100558 +++ compcache -0.5.4/sub-projects/compression/lzo-kmod/lzodefs.h 2009-10-17 09:35:59.000000000 +0200549 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h compcache/sub-projects/compression/lzo-kmod/lzodefs.h 550 --- compcache-old/sub-projects/compression/lzo-kmod/lzodefs.h 1970-01-01 01:00:00.000000000 +0100 551 +++ compcache/sub-projects/compression/lzo-kmod/lzodefs.h 2009-10-17 09:35:59.000000000 +0200 559 552 @@ -0,0 +1,43 @@ 560 553 +/* … … 601 594 + << (s1)) ^ (p)[0]) 602 595 +#define DX3(p, s1, s2, s3) ((DX2((p)+1, s2, s3) << (s1)) ^ (p)[0]) 603 diff -uNr compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo.h compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo.h604 --- compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/lzo.h 1970-01-01 01:00:00.000000000 +0100605 +++ compcache -0.5.4/sub-projects/compression/lzo-kmod/lzo.h 2009-10-17 09:35:59.000000000 +0200596 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/lzo.h compcache/sub-projects/compression/lzo-kmod/lzo.h 597 --- compcache-old/sub-projects/compression/lzo-kmod/lzo.h 1970-01-01 01:00:00.000000000 +0100 598 +++ compcache/sub-projects/compression/lzo-kmod/lzo.h 2009-10-17 09:35:59.000000000 +0200 606 599 @@ -0,0 +1,44 @@ 607 600 +#ifndef __LZO_H__ … … 649 642 + 650 643 +#endif 651 diff -uNr compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/Makefile compcache-0.5.4/sub-projects/compression/lzo-kmod/Makefile652 --- compcache- 0.5.4-old/sub-projects/compression/lzo-kmod/Makefile 1970-01-01 01:00:00.000000000 +0100653 +++ compcache -0.5.4/sub-projects/compression/lzo-kmod/Makefile 2009-10-17 09:35:59.000000000 +0200644 diff -uNr compcache-old/sub-projects/compression/lzo-kmod/Makefile compcache/sub-projects/compression/lzo-kmod/Makefile 645 --- compcache-old/sub-projects/compression/lzo-kmod/Makefile 1970-01-01 01:00:00.000000000 +0100 646 +++ compcache/sub-projects/compression/lzo-kmod/Makefile 2009-10-17 09:35:59.000000000 +0200 654 647 @@ -0,0 +1,8 @@ 655 648 +obj-m += lzo1x_compress.o lzo1x_decompress.o
Note: See TracChangeset
for help on using the changeset viewer.