domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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@makrotopia.org>

SVN-Revision: 45612
This commit is contained in:
Steven Barth
2015-05-05 13:22:33 +00:00
parent 2a196a68cd
commit 336fc7a702
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/kernel/linux/modules/netsupport.mk
View File

@@ -895,11 +895,13 @@ $(eval $(call KernelPackage,l2tp-eth))
define KernelPackage/l2tp-ip define KernelPackage/l2tp-ip
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=L2TP IP + IPv6 encapsulation for L2TPv3 TITLE:=L2TP IP encapsulation for L2TPv3
DEPENDS:=+kmod-l2tp +kmod-ipv6 DEPENDS:=+kmod-l2tp +IPV6:kmod-ipv6
KCONFIG:=CONFIG_L2TP_IP KCONFIG:=CONFIG_L2TP_IP
FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko $(LINUX_DIR)/net/l2tp/l2tp_ip6.ko FILES:= \
AUTOLOAD:=$(call AutoLoad,33,l2tp_ip l2tp_ip6) $(LINUX_DIR)/net/l2tp/l2tp_ip.ko \
$(if $(CONFIG_IPV6),$(LINUX_DIR)/net/l2tp/l2tp_ip6.ko)
AUTOLOAD:=$(call AutoLoad,33,l2tp_ip $(if $(CONFIG_IPV6),l2tp_ip6))
endef endef
define KernelPackage/l2tp-ip/description define KernelPackage/l2tp-ip/description