X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fcompcache%2FMakefile;h=f7b7c5b3f184329efc48a45e676fd99a7819adb7;hb=dd8cea56076f47c1fca1a276c6b050c0087c8c2d;hp=98a1cadf52361c4069f9efc71448bc739f79cc6a;hpb=81e1c4c68ea22ffeed2ce1f40551a3232ba408ad;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/package/compcache/Makefile b/package/compcache/Makefile
index 98a1cadf52..f7b7c5b3f1 100644
--- a/package/compcache/Makefile
+++ b/package/compcache/Makefile
@@ -1,49 +1,70 @@
 #
-# Copyright (C) 2009 OpenWrt.org
+# Copyright (C) 2009-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id: Makefile 6562 2009-10-05 08:30:14 ghd $
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=compcache
-PKG_VERSION:=0.5.4
-PKG_RELEASE:=$(PKG_VERSION)-1
+PKG_VERSION:=0.6.2
+PKG_RELEASE:=3
 PKG_SOURCE_URL:=http://compcache.googlecode.com/files/
-PKG_MD5SUM:=e83535925a014ac34e1eaeb4f7a2f49a
+PKG_MD5SUM:=27aec78dc50e34fb800c74e879057743
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 include $(INCLUDE_DIR)/package.mk
 
-define KernelPackage/compcache
+define KernelPackage/ramzswap
   SUBMENU:=Other modules
-  DEPENDS:=@LINUX_2_6 @BUSYBOX_CONFIG_SWAPONOFF
+  DEPENDS:=@BUSYBOX_CONFIG_SWAPONOFF
   TITLE:=Driver for compressed ram swap device
   VERSION:=$(LINUX_VERSION)-$(BOARD)-$(LINUX_RELEASE)+$(PKG_RELEASE)
-  FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \
-	  $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) \
-	  $(PKG_BUILD_DIR)/sub-projects/allocators/xvmalloc-kmod/xvmalloc.$(LINUX_KMOD_SUFFIX)
+  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
+  URL:=http://code.google.com/p/compcache/
+endef
+
+define Package/compcache
+  SECTION:=util
+  CATEGORY:=Utilities
+  DEPENDS:=+kmod-ramzswap
+  TITLE:=Compressed ram swap device
+  URL:=http://code.google.com/p/compcache/
+  MENU:=1
 endef
 
 include $(INCLUDE_DIR)/kernel-defaults.mk
 
-XVM = sub-projects/allocators/xvmalloc-kmod
-LZO = sub-projects/compression/lzo-kmod
+RZSC = sub-projects/rzscontrol
 
-BUILDFLAGS:=-DCONFIG_BLK_DEV_RAMZSWAP_STATS \
-	    -I$(PKG_BUILD_DIR)/$(XVM) \
-	    -I$(PKG_BUILD_DIR)/$(LZO) \
-	    -g -Wall
+RZSCFLAGS:=-I$(PKG_BUILD_DIR)/$(RZSC)/../include \
+	   -I$(PKG_BUILD_DIR)/$(RZSC)/../..
 
-define Build/Compile
-	$(MAKE) $(KERNEL_MAKEOPTS) EXTRA_CFLAGS="$(BUILDFLAGS)" M="$(PKG_BUILD_DIR)" modules
-endef
+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
+	$(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol
+ endef
+endif
 
-define KernelPackage/compcache/install
+define Package/compcache/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DATA) ./files/compcache.config $(1)/etc/config/compcache
 	$(SED) 's,%ENABLED%,$(if $(CONFIG_COMPCACHE_ENABLE),1,0),g' \
@@ -51,11 +72,18 @@ define KernelPackage/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
 
-define KernelPackage/compcache/config
+define Package/compcache/config
 	source "$(SOURCE)/Config.in"
 endef
 
-$(eval $(call KernelPackage,compcache))
+$(eval $(call BuildPackage,compcache))
+$(eval $(call KernelPackage,ramzswap))