[package] ipset: use a common DEPENDS for both ipset and kmod-ipset packages

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18902 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b2095d6..e7870c5 100644 (file)
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -18,10 +18,15 @@ PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b
 
 include $(INCLUDE_DIR)/package.mk
 
 
 include $(INCLUDE_DIR)/package.mk
 

+define Package/ipset/Default
+  DEPENDS:= @LINUX_2_6
+endef
+

 define Package/ipset
 define Package/ipset

+$(call Package/ipset/Default)

   SECTION:=net
   CATEGORY:=Network
   SECTION:=net
   CATEGORY:=Network

-  DEPENDS:= @LINUX_2_6 +iptables-mod-ipset +kmod-ipt-ipset
+  DEPENDS+= +iptables-mod-ipset +kmod-ipt-ipset

   TITLE:=IPset administration utility
   URL:=http://ipset.netfilter.org/
 endef
   TITLE:=IPset administration utility
   URL:=http://ipset.netfilter.org/
 endef


@@ -67,9 +72,10 @@ define Package/ipset/install
 endef
 
 define KernelPackage/ipt-ipset
 endef
 
 define KernelPackage/ipt-ipset

+$(call Package/ipset/Default)

   SUBMENU:=Netfilter Extensions
   TITLE:=IPset netfilter modules
   SUBMENU:=Netfilter Extensions
   TITLE:=IPset netfilter modules

-  DEPENDS:= @LINUX_2_6 kmod-ipt-core
+  DEPENDS+= kmod-ipt-core

   FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,46,$(IPSET_MODULES))
 endef
   FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/$(mod).ko)
   AUTOLOAD:=$(call AutoLoad,46,$(IPSET_MODULES))
 endef