diff options
| author | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-06 15:46:13 +0000 |
|---|---|---|
| committer | acoul <acoul@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-08-06 15:46:13 +0000 |
| commit | 661d69728519dd178dc614eee51245b26940a170 (patch) | |
| tree | 2b75adc32c3f10e62bf6a99f86334f43bb0367e2 /package/compcache/Makefile | |
| parent | 14cf3c5e76d3c0e64ffa30c2149fb32fe375da94 (diff) | |
package/compcache: revert r22458 as there are some issues with the mainline code
http://code.google.com/p/compcache/issues/detail?id=68
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22514 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/compcache/Makefile')
| -rw-r--r-- | package/compcache/Makefile | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/package/compcache/Makefile b/package/compcache/Makefile index f7b7c5b3f1..5106293e8d 100644 --- a/package/compcache/Makefile +++ b/package/compcache/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=compcache PKG_VERSION:=0.6.2 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE_URL:=http://compcache.googlecode.com/files/ PKG_MD5SUM:=27aec78dc50e34fb800c74e879057743 @@ -23,17 +23,8 @@ define KernelPackage/ramzswap DEPENDS:=@BUSYBOX_CONFIG_SWAPONOFF TITLE:=Driver for compressed ram swap device VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE) - KCONFIG:=CONFIG_RAMZSWAP=m CONFIG_RAMZSWAP_STATS=n -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) - FILES:= \ - $(LINUX_DIR)/drivers/staging/ramzswap/ramzswap.ko \ - $(LINUX_DIR)/lib/lzo/lzo_compress.ko \ - $(LINUX_DIR)/lib/lzo/lzo_decompress.ko -else - FILES:= \ - $(PKG_BUILD_DIR)/ramzswap.ko \ - $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.ko -endif + FILES:=$(PKG_BUILD_DIR)/ramzswap.ko \ + $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.ko URL:=http://code.google.com/p/compcache/ endef @@ -48,21 +39,20 @@ endef include $(INCLUDE_DIR)/kernel-defaults.mk +LZO = sub-projects/compression/lzo-kmod RZSC = sub-projects/rzscontrol +BUILDFLAGS:=-DCONFIG_RAMZSWAP_STATS \ + -I$(PKG_BUILD_DIR)/$(LZO) \ + -Wall + RZSCFLAGS:=-I$(PKG_BUILD_DIR)/$(RZSC)/../include \ -I$(PKG_BUILD_DIR)/$(RZSC)/../.. -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) - define Build/Compile - $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol - endef -else - define Build/Compile - $(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod -Wall" M="$(PKG_BUILD_DIR)" modules +define Build/Compile + $(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="$(BUILDFLAGS)" M="$(PKG_BUILD_DIR)" modules $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol - endef -endif +endef define Package/compcache/install $(INSTALL_DIR) $(1)/etc/config @@ -72,11 +62,7 @@ define Package/compcache/install -e 's,%BACKUP_DEV%,$(call qstrip,$(CONFIG_COMPCACHE_BACKUP_DEV)),g' \ $(1)/etc/config/compcache $(INSTALL_DIR) $(1)/etc/init.d -ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) - $(INSTALL_BIN) ./files/compcache.init.new $(1)/etc/init.d/compcache -else $(INSTALL_BIN) ./files/compcache.init $(1)/etc/init.d/compcache -endif $(INSTALL_DIR) $(1)/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/rzscontrol $(1)/sbin/rzscontrol endef |