aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-12-23 09:32:45 +0000
committerNicolas Thill <nico@openwrt.org>2009-12-23 09:32:45 +0000
commit214b3c90f3ef142cb59b527d83f1734508adb9a3 (patch)
tree3d26befc61f312172f12a42cf21884671fb9d854
parentf624d673dd698ca2a1ef5d3e754f1a166f75d844 (diff)
downloadupstream-214b3c90f3ef142cb59b527d83f1734508adb9a3.tar.gz
upstream-214b3c90f3ef142cb59b527d83f1734508adb9a3.tar.bz2
upstream-214b3c90f3ef142cb59b527d83f1734508adb9a3.zip
ipset: use a common DEPENDS for both ipset and kmod-ipset packages
SVN-Revision: 18902
-rw-r--r--package/ipset/Makefile10
1 files changed, 8 insertions, 2 deletions
diff --git a/package/ipset/Makefile b/package/ipset/Makefile
index b2095d668f..e7870c5585 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