aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2009-01-27 17:24:31 +0000
committerNicolas Thill <nico@openwrt.org>2009-01-27 17:24:31 +0000
commit0ac8a6005d5206cf2de48c81d038d5f39235d4e9 (patch)
tree109707d344304fc7526953c6f9c450ec8f64f975
parent8bcc0a98bcbffe09e66300adf91ae617b8f5c2ff (diff)
downloadmaster-187ad058-0ac8a6005d5206cf2de48c81d038d5f39235d4e9.tar.gz
master-187ad058-0ac8a6005d5206cf2de48c81d038d5f39235d4e9.tar.bz2
master-187ad058-0ac8a6005d5206cf2de48c81d038d5f39235d4e9.zip
fix kmod-sit dependencies
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14222 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/kernel/modules/netsupport.mk15
1 files changed, 3 insertions, 12 deletions
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/modules/netsupport.mk
index add8024796..73c8b0252e 100644
--- a/package/kernel/modules/netsupport.mk
+++ b/package/kernel/modules/netsupport.mk
@@ -276,21 +276,12 @@ endef
$(eval $(call KernelPackage,ipv6))
+# sit is not selectable on 2.4, but built when ipv6 is enabled
define KernelPackage/sit
SUBMENU:=$(NETWORK_SUPPORT_MENU)
- DEPENDS:=+kmod-iptunnel4
+ DEPENDS:=+kmod-ipv6 +LINUX_2_6:kmod-iptunnel4
TITLE:=IPv6-in-IPv4 tunnelling
-endef
-
-# sit is compiled in the 2.4 ipv6 stack
-define KernelPackage/sit/2.4
- DEPENDS:= @LINUX_2_4 +kmod-ipv6
- KCONFIG:=CONFIG_IPV6
-endef
-
-define KernelPackage/sit/2.6
- DEPENDS:= @LINUX_2_6 +kmod-ipv6 +kmod-iptunnel4
- KCONFIG+=CONFIG_IPV6_SIT
+ KCONFIG:=CONFIG_IPV6 CONFIG_IPV6_SIT
FILES:=$(LINUX_DIR)/net/ipv6/sit.$(LINUX_KMOD_SUFFIX)
AUTOLOAD:=$(call AutoLoad,32,sit)
endef