aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel
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
commitf9b20ad946f2a111d346c58a7169325ed7bb34f3 (patch)
tree3c61fb4a2320da01db523a498832c3490276431e /package/kernel
parent263b05274f8b6f5adc9b8dc678f2a9d11b600207 (diff)
downloadupstream-f9b20ad946f2a111d346c58a7169325ed7bb34f3.tar.gz
upstream-f9b20ad946f2a111d346c58a7169325ed7bb34f3.tar.bz2
upstream-f9b20ad946f2a111d346c58a7169325ed7bb34f3.zip
fix kmod-sit dependencies
SVN-Revision: 14222
Diffstat (limited to 'package/kernel')
-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