Changeset 45612


Ignore:
Timestamp:
2015-05-05T15:22:33+02:00 (3 years ago)
Author:
cyrus
Message:

netsupport: l2tp-ip: only depend on IPv6 if IPv6 support is enabled

Before r45593 kmod-l2tp-ip did not depend on kmod-ipv6.
With r45593 support for L2TP IPv6 encapsulation was added and
included in the kmod-l2tp-ip package. This change also
added the dependency to kmod-ipv6 to kmod-l2tp-ip, regardless
of whether the user chose to generally include IPv6 support
or not.
Change this so L2TP over IPv6 and the resulting dependency
to kmod-ipv6 is only included in kmod-l2tp-ip if IPv6 support
is enabled.

Signed-off-by: Daniel Golle <daniel@…>

File:
1 edited

Legend:

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

    r45593 r45612  
    896896define KernelPackage/l2tp-ip 
    897897  SUBMENU:=$(NETWORK_SUPPORT_MENU) 
    898   TITLE:=L2TP IP + IPv6 encapsulation for L2TPv3 
    899   DEPENDS:=+kmod-l2tp +kmod-ipv6 
     898  TITLE:=L2TP IP encapsulation for L2TPv3 
     899  DEPENDS:=+kmod-l2tp +IPV6:kmod-ipv6 
    900900  KCONFIG:=CONFIG_L2TP_IP 
    901   FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko $(LINUX_DIR)/net/l2tp/l2tp_ip6.ko 
    902   AUTOLOAD:=$(call AutoLoad,33,l2tp_ip l2tp_ip6) 
     901  FILES:= \ 
     902        $(LINUX_DIR)/net/l2tp/l2tp_ip.ko \ 
     903        $(if $(CONFIG_IPV6),$(LINUX_DIR)/net/l2tp/l2tp_ip6.ko) 
     904  AUTOLOAD:=$(call AutoLoad,33,l2tp_ip $(if $(CONFIG_IPV6),l2tp_ip6)) 
    903905endef 
    904906 
Note: See TracChangeset for help on using the changeset viewer.