r45593 includes l2tp_ip6 in the kmod-l2tp-ip package. This is not feasible for several reasons: - in a given setup one usually uses either l2tp_ip or l2tp_ip6, but never both - l2tp_ip doesn't depend on ipv6 - versioning of kmod-l2tp-ip doesn't indicate that it now does include support for L2TP-over-IPv6
I did waste some thoughts and actually my inital approach to include l2tp_ip6 looked very much like what was applied in r45593. However, there might be people making use of kmod-l2tp-ip on devices not having the resources to also include kmod-ipv6, and we usually prefer the most atomic packaging possible. Signed-off-by: Daniel Golle <dan...@makrotopia.org> --- package/kernel/linux/modules/netsupport.mk | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index 7ec3d29..e920509 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -895,11 +895,11 @@ $(eval $(call KernelPackage,l2tp-eth)) define KernelPackage/l2tp-ip SUBMENU:=$(NETWORK_SUPPORT_MENU) - TITLE:=L2TP IP + IPv6 encapsulation for L2TPv3 - DEPENDS:=+kmod-l2tp +kmod-ipv6 + TITLE:=L2TP IP encapsulation for L2TPv3 + DEPENDS:=+kmod-l2tp KCONFIG:=CONFIG_L2TP_IP - FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko $(LINUX_DIR)/net/l2tp/l2tp_ip6.ko - AUTOLOAD:=$(call AutoLoad,33,l2tp_ip l2tp_ip6) + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip.ko + AUTOLOAD:=$(call AutoLoad,33,l2tp_ip) endef define KernelPackage/l2tp-ip/description @@ -908,6 +908,21 @@ endef $(eval $(call KernelPackage,l2tp-ip)) +define KernelPackage/l2tp-ip6 + SUBMENU:=$(NETWORK_SUPPORT_MENU) + TITLE:=L2TP IPv6 encapsulation for L2TPv3 + DEPENDS:=+kmod-l2tp +kmod-ipv6 + KCONFIG:=CONFIG_L2TP_IP + FILES:=$(LINUX_DIR)/net/l2tp/l2tp_ip6.ko + AUTOLOAD:=$(call AutoLoad,33,l2tp_ip6) +endef + +define KernelPackage/l2tp-ip6/description + Kernel modules for L2TP IP6 encapsulation for L2TPv3 +endef + +$(eval $(call KernelPackage,l2tp-ip6)) + define KernelPackage/sctp SUBMENU:=$(NETWORK_SUPPORT_MENU) -- 2.3.7 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel