From 841c7d1ddd6a79bc878a0c1494e455d88b23567c Mon Sep 17 00:00:00 2001 From: lars Date: Thu, 13 May 2010 11:36:38 +0000 Subject: [PATCH] [package] compcache: Kernel module and userspace daemon in seperate packages. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21441 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/compcache/Config.in | 2 +- package/compcache/Makefile | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/package/compcache/Config.in b/package/compcache/Config.in index 11a94d434..b5f75d00d 100644 --- a/package/compcache/Config.in +++ b/package/compcache/Config.in @@ -1,5 +1,5 @@ menu "Configuration" - depends on PACKAGE_kmod-compcache + depends on PACKAGE_compcache config COMPCACHE_ENABLE bool "enabled on boot" diff --git a/package/compcache/Makefile b/package/compcache/Makefile index feb6cd315..cf325a493 100644 --- a/package/compcache/Makefile +++ b/package/compcache/Makefile @@ -18,7 +18,7 @@ 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 TITLE:=Driver for compressed ram swap device @@ -26,9 +26,16 @@ define KernelPackage/compcache FILES:=$(PKG_BUILD_DIR)/ramzswap.$(LINUX_KMOD_SUFFIX) \ $(PKG_BUILD_DIR)/sub-projects/compression/lzo-kmod/lzo1x.$(LINUX_KMOD_SUFFIX) URL:=http://code.google.com/p/compcache/ - MENU:=1 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 @@ -47,7 +54,7 @@ define Build/Compile $(TARGET_CC) $(TARGET_CFLAGS) $(RZSCFLAGS) $(PKG_BUILD_DIR)/$(RZSC)/rzscontrol.c -o $(PKG_BUILD_DIR)/rzscontrol endef -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' \ @@ -60,8 +67,9 @@ define KernelPackage/compcache/install $(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))