Changeset 20303


Ignore:
Timestamp:
2010-03-19T17:34:41+01:00 (8 years ago)
Author:
florian
Message:

[package] update compcache to 0.6.2 (#6884)

Location:
trunk/package/compcache
Files:
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/package/compcache/Makefile

    r19981 r20303  
    1111 
    1212PKG_NAME:=compcache 
    13 PKG_VERSION:=0.5.4 
     13PKG_VERSION:=0.6.2 
    1414PKG_RELEASE:=$(PKG_VERSION)-1 
    1515PKG_SOURCE_URL:=http://compcache.googlecode.com/files/ 
    16 PKG_MD5SUM:=e83535925a014ac34e1eaeb4f7a2f49a 
     16PKG_MD5SUM:=27aec78dc50e34fb800c74e879057743 
    1717 
    1818PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    … …  
    2626  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) 
    2727  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) 
    3029endef 
     30 
    3131 
    3232include $(INCLUDE_DIR)/kernel-defaults.mk 
    3333 
    34 XVM = sub-projects/allocators/xvmalloc-kmod 
    3534LZO = sub-projects/compression/lzo-kmod 
     35RZSC = sub-projects/rzscontrol 
    3636 
    37 BUILDFLAGS:=-DCONFIG_BLK_DEV_RAMZSWAP_STATS \ 
    38             -I$(PKG_BUILD_DIR)/$(XVM) \ 
     37BUILDFLAGS:=-DCONFIG_RAMZSWAP_STATS \ 
    3938            -I$(PKG_BUILD_DIR)/$(LZO) \ 
    40             -g -Wall 
     39            -Wall 
     40 
     41RZSCFLAGS:=-I$(PKG_BUILD_DIR)/$(RZSC)/../include \ 
     42           -I$(PKG_BUILD_DIR)/$(RZSC)/../.. 
    4143 
    4244define Build/Compile 
    4345        $(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 
    4447endef 
    4548 
    … …  
    5356        $(INSTALL_DIR) $(1)/etc/init.d 
    5457        $(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 
    5560endef 
    5661 

  • trunk/package/compcache/files/compcache.init

    r18512 r20303  
    1919                        fi 
    2020                        if [ "`lsmod | grep 'ramzswap'`" == "" ]; then 
    21                                 insmod xvmalloc 
    2221                                insmod lzo1x 
    2322                                insmod ramzswap $params_set 
    … …  
    3534                [ "`lsmod | grep 'ramzswap'`" != "" ] && rmmod ramzswap &> /dev/null 
    3635                [ "`lsmod | grep 'lzo1x'`" != "" ] && rmmod lzo1x &> /dev/null 
    37                 [ "`lsmod | grep 'xvmalloc'`" != "" ] && rmmod xvmalloc &> /dev/null 
    3836        fi 
    3937} 

  • trunk/package/compcache/patches/000-provide_lzo_kmod.patch

    r18512 r20303  
    1 diff -uNr compcache-0.5.4-old/Makefile compcache-0.5.4/Makefile 
    2 --- compcache-0.5.4-old/Makefile        2009-10-17 08:49:42.000000000 +0200 
    3 +++ compcache-0.5.4/Makefile    2009-10-17 09:39:34.000000000 +0200 
    4 @@ -1,19 +1,26 @@ 
     1diff -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 @@ 
    55 KERNEL_BUILD_PATH ?= "/lib/modules/$(shell uname -r)/build" 
    66  
    77 XVM = sub-projects/allocators/xvmalloc-kmod 
    8 -EXTRA_CFLAGS   :=      -DCONFIG_BLK_DEV_RAMZSWAP_STATS \ 
    9 -                       -I$(PWD)/$(XVM)                 \ 
    108+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 
    1611  
    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+                        
    2016  
    2117 all: 
    22         make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(XVM) modules 
     18        make -C $(KERNEL_BUILD_PATH) M=$(PWD) modules 
    2319+       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 @@ 
    2724  
    2825 clean: 
    2926        make -C $(KERNEL_BUILD_PATH) M=$(PWD) clean 
    30         make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(XVM) clean 
    3127+       make -C $(KERNEL_BUILD_PATH) M=$(PWD)/$(LZO) clean 
     28        make -C sub-projects/rzscontrol clean 
    3229        @rm -rf *.ko 
    33 diff -uNr compcache-0.5.4-old/ramzswap.c compcache-0.5.4/ramzswap.c 
    34 --- compcache-0.5.4-old/ramzswap.c      2009-10-17 08:50:06.000000000 +0200 
    35 +++ compcache-0.5.4/ramzswap.c  2009-10-17 09:35:59.000000000 +0200 
    36 @@ -20,7 +20,6 @@ 
     30diff -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 @@ 
    3734 #include <linux/device.h> 
    3835 #include <linux/genhd.h> 
    3936 #include <linux/highmem.h> 
    4037-#include <linux/lzo.h> 
    41  #include <linux/mutex.h> 
    42  #include <linux/proc_fs.h> 
    4338 #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> 
    4943  
    50  #include "xvmalloc.h" 
    5144+#include "lzo.h" 
     45 #include "compat.h" 
     46 #include "ramzswap_drv.h" 
    5247  
    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 
     48diff -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 
    5851@@ -0,0 +1,7 @@ 
    5952+#include <linux/module.h> 
    … …  
    6457+MODULE_LICENSE("GPL"); 
    6558+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.c 
    67 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_compress.c      1970-01-01 01:00:00.000000000 +0100 
    68 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x_compress.c  2009-10-17 09:35:59.000000000 +0200 
     59diff -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 
    6962@@ -0,0 +1,227 @@ 
    7063+/* 
    … …  
    295288+MODULE_DESCRIPTION("LZO1X-1 Compressor"); 
    296289+ 
    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.c 
    298 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzo1x_decompress.c    1970-01-01 01:00:00.000000000 +0100 
    299 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo1x_decompress.c        2009-10-17 09:35:59.000000000 +0200 
     290diff -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 
    300293@@ -0,0 +1,255 @@ 
    301294+/* 
    … …  
    554547+MODULE_DESCRIPTION("LZO1X Decompressor"); 
    555548+ 
    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.h 
    557 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzodefs.h     1970-01-01 01:00:00.000000000 +0100 
    558 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/lzodefs.h 2009-10-17 09:35:59.000000000 +0200 
     549diff -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 
    559552@@ -0,0 +1,43 @@ 
    560553+/* 
    … …  
    601594+                                                       << (s1)) ^ (p)[0]) 
    602595+#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.h 
    604 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/lzo.h 1970-01-01 01:00:00.000000000 +0100 
    605 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/lzo.h     2009-10-17 09:35:59.000000000 +0200 
     596diff -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 
    606599@@ -0,0 +1,44 @@ 
    607600+#ifndef __LZO_H__ 
    … …  
    649642+ 
    650643+#endif 
    651 diff -uNr compcache-0.5.4-old/sub-projects/compression/lzo-kmod/Makefile compcache-0.5.4/sub-projects/compression/lzo-kmod/Makefile 
    652 --- compcache-0.5.4-old/sub-projects/compression/lzo-kmod/Makefile      1970-01-01 01:00:00.000000000 +0100 
    653 +++ compcache-0.5.4/sub-projects/compression/lzo-kmod/Makefile  2009-10-17 09:35:59.000000000 +0200 
     644diff -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 
    654647@@ -0,0 +1,8 @@ 
    655648+obj-m += lzo1x_compress.o lzo1x_decompress.o 
Note: See TracChangeset for help on using the changeset viewer.