Changeset 22514


Ignore:
Timestamp:
2010-08-06T17:46:13+02:00 (8 years ago)
Author:
acoul
Message:

package/compcache: revert r22458 as there are some issues with the mainline code

http://code.google.com/p/compcache/issues/detail?id=68

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

Legend:

Unmodified
Added
Removed
  • trunk/package/compcache/Makefile

    r22458 r22514  
    1111PKG_NAME:=compcache 
    1212PKG_VERSION:=0.6.2 
    13 PKG_RELEASE:=3 
     13PKG_RELEASE:=2 
    1414PKG_SOURCE_URL:=http://compcache.googlecode.com/files/ 
    1515PKG_MD5SUM:=27aec78dc50e34fb800c74e879057743 
     
    2424  TITLE:=Driver for compressed ram swap device 
    2525  VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) 
    26   KCONFIG:=CONFIG_RAMZSWAP=m CONFIG_RAMZSWAP_STATS=n 
    27 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
    28   FILES:= \ 
    29         $(LINUX_DIR)/drivers/staging/ramzswap/ramzswap.ko \ 
    30         $(LINUX_DIR)/lib/lzo/lzo_compress.ko \ 
    31         $(LINUX_DIR)/lib/lzo/lzo_decompress.ko  
    32 else 
    33   FILES:= \ 
    34         $(PKG_BUILD_DIR)/ramzswap.ko \ 
    35         $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.ko 
    36 endif 
     26  FILES:=$(PKG_BUILD_DIR)/ramzswap.ko \ 
     27         $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.ko 
    3728  URL:=http://code.google.com/p/compcache/ 
    3829endef 
     
    4940include $(INCLUDE_DIR)/kernel-defaults.mk 
    5041 
     42LZO = sub-projects/compression/lzo-kmod 
    5143RZSC = sub-projects/rzscontrol 
     44 
     45BUILDFLAGS:=-DCONFIG_RAMZSWAP_STATS \ 
     46            -I$(PKG_BUILD_DIR)/$(LZO) \ 
     47            -Wall 
    5248 
    5349RZSCFLAGS:=-I$(PKG_BUILD_DIR)/$(RZSC)/../include \ 
    5450           -I$(PKG_BUILD_DIR)/$(RZSC)/../.. 
    5551 
    56 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
    57  define Build/Compile 
    58         $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol  
    59  endef 
    60 else  
    61  define Build/Compile 
    62         $(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod -Wall" M="$(PKG_BUILD_DIR)" modules 
     52define Build/Compile 
     53        $(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="$(BUILDFLAGS)" M="$(PKG_BUILD_DIR)" modules 
    6354        $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol 
    64  endef 
    65 endif 
     55endef 
    6656 
    6757define Package/compcache/install 
     
    7363              $(1)/etc/config/compcache 
    7464        $(INSTALL_DIR) $(1)/etc/init.d 
    75 ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
    76         $(INSTALL_BIN) ./files/compcache.init.new $(1)/etc/init.d/compcache 
    77 else 
    7865        $(INSTALL_BIN) ./files/compcache.init $(1)/etc/init.d/compcache 
    79 endif 
    8066        $(INSTALL_DIR) $(1)/sbin 
    8167        $(INSTALL_BIN) $(PKG_BUILD_DIR)/rzscontrol $(1)/sbin/rzscontrol 
Note: See TracChangeset for help on using the changeset viewer.