mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 04:33:21 +02:00
revert [14081]: iptunnel4 does not make sense on 2.4, just add a conditionnal dependency on iptunnel4 to ipip
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14219 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
dbb5095d22
commit
86b7caafed
@ -118,7 +118,7 @@ $(eval $(call KernelPackage,misdn))
|
||||
define KernelPackage/ipip
|
||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||
TITLE:=IP-in-IP encapsulation
|
||||
DEPENDS:=+kmod-iptunnel4
|
||||
DEPENDS:=+LINUX_2_6:kmod-iptunnel4
|
||||
KCONFIG:=CONFIG_NET_IPIP
|
||||
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
|
||||
AUTOLOAD:=$(call AutoLoad,32,ipip)
|
||||
@ -216,22 +216,19 @@ endef
|
||||
|
||||
$(eval $(call KernelPackage,ipsec6))
|
||||
|
||||
|
||||
# NOTE: tunnel4 is not selectable by itself, so enable ipip for that
|
||||
define KernelPackage/iptunnel4
|
||||
TITLE:=IP in IP encapsulation support
|
||||
KCONFIG:=$(CONFIG_NET_IPIP)
|
||||
SUBMENU:=$(NSMENU)
|
||||
endef
|
||||
|
||||
define KernelPackage/iptunnel4/2.4
|
||||
FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX)
|
||||
AUTOLOAD:=$(call AutoLoad,30,ipip)
|
||||
endef
|
||||
|
||||
define KernelPackage/iptunnel4/2.6
|
||||
FILES:= \
|
||||
$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \
|
||||
$(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX)
|
||||
AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4)
|
||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||
TITLE:=IPv4 tunneling
|
||||
DEPENDS:=@LINUX_2_6
|
||||
KCONFIG:= \
|
||||
CONFIG_NET_IPIP \
|
||||
CONFIG_INET_TUNNEL
|
||||
FILES:= $(foreach mod,tunnel4, \
|
||||
$(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \
|
||||
)
|
||||
AUTOLOAD:=$(call AutoLoad,31,tunnel4)
|
||||
endef
|
||||
|
||||
define KernelPackage/iptunnel4/description
|
||||
@ -240,6 +237,7 @@ endef
|
||||
|
||||
$(eval $(call KernelPackage,iptunnel4))
|
||||
|
||||
|
||||
define KernelPackage/iptunnel6
|
||||
SUBMENU:=$(NETWORK_SUPPORT_MENU)
|
||||
TITLE:=IPv6 tunneling
|
||||
|
Loading…
Reference in New Issue
Block a user