From: Nicolas Thill <nico@openwrt.org>
Date: Wed, 23 Dec 2009 09:32:45 +0000 (+0000)
Subject: ipset: use a common DEPENDS for both ipset and kmod-ipset packages
X-Git-Tag: reboot~21592
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=214b3c90f3ef142cb59b527d83f1734508adb9a3;p=openwrt%2Fstaging%2Fblogic.git

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

SVN-Revision: 18902
---

diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b2095d668fde..e7870c558529 100644
--- a/package/ipset/Makefile
+++ b/package/ipset/Makefile
@@ -18,10 +18,15 @@ PKG_MD5SUM:=d104007fdf5ea64fef774c22b1c0a97b
 
 include $(INCLUDE_DIR)/package.mk
 
+define Package/ipset/Default
+  DEPENDS:= @LINUX_2_6
+endef
+
 define Package/ipset
+$(call Package/ipset/Default)
   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
@@ -67,9 +72,10 @@ define Package/ipset/install
 endef
 
 define KernelPackage/ipt-ipset
+$(call Package/ipset/Default)
   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