Changeset 14219


Ignore:
Timestamp:
2009-01-27T10:56:05+01:00 (8 years ago)
Author:
nico
Message:

revert [14081]: iptunnel4 does not make sense on 2.4, just add a conditionnal dependency on iptunnel4 to ipip

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/kernel/modules/netsupport.mk

    r14095 r14219  
    119119  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    120120  TITLE:=IP-in-IP encapsulation 
    121   DEPENDS:=+kmod-iptunnel4 
     121  DEPENDS:=+LINUX_2_6:kmod-iptunnel4 
    122122  KCONFIG:=CONFIG_NET_IPIP 
    123123  FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) 
     
    217217$(eval $(call KernelPackage,ipsec6)) 
    218218 
     219 
     220# NOTE: tunnel4 is not selectable by itself, so enable ipip for that 
    219221define KernelPackage/iptunnel4 
    220   TITLE:=IP in IP encapsulation support 
    221   KCONFIG:=$(CONFIG_NET_IPIP) 
    222   SUBMENU:=$(NSMENU) 
    223 endef 
    224  
    225 define KernelPackage/iptunnel4/2.4 
    226   FILES:=$(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) 
    227   AUTOLOAD:=$(call AutoLoad,30,ipip) 
    228 endef 
    229  
    230 define KernelPackage/iptunnel4/2.6 
    231   FILES:= \ 
    232         $(LINUX_DIR)/net/ipv4/ipip.$(LINUX_KMOD_SUFFIX) \ 
    233         $(LINUX_DIR)/net/ipv4/tunnel4.$(LINUX_KMOD_SUFFIX) 
    234   AUTOLOAD:=$(call AutoLoad,30,ipip tunnel4) 
     222  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
     223  TITLE:=IPv4 tunneling 
     224  DEPENDS:=@LINUX_2_6 
     225  KCONFIG:= \ 
     226        CONFIG_NET_IPIP \ 
     227        CONFIG_INET_TUNNEL 
     228  FILES:= $(foreach mod,tunnel4, \ 
     229        $(LINUX_DIR)/net/ipv4/$(mod).$(LINUX_KMOD_SUFFIX) \ 
     230  ) 
     231  AUTOLOAD:=$(call AutoLoad,31,tunnel4) 
    235232endef 
    236233 
     
    240237 
    241238$(eval $(call KernelPackage,iptunnel4)) 
     239 
    242240 
    243241define KernelPackage/iptunnel6 
Note: See TracChangeset for help on using the changeset viewer.