KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Configure IPv6 kernel options in config/Config-kernel.in

Browse source 
Revision 46834 changed IPv6 support from a module to builtin. But
since the configuration of the IPv6 kernel options was left in
package/kernel/linux/modules/netsupport.mk, this means that an
empty kmod-ipv6 module was still being generated (not packaged).

This patch moves the configuration of the IPv6 kernel options to
config/Config-kernel.in to remove this last bit of the module.

Note that CONFIG_IPV6_PRIVACY was dropped (enabled by default
since Linux v3.13), so this option is no longer needed.

See 5d9efa7ee9

Signed-off-by: Arjen de Korte <arjen+openwrt@de-korte.org>

SVN-Revision: 48132
This commit is contained in:
Felix Fietkau 2016-01-04 23:30:36 +00:00
parent 48a57b1ead
commit 33beafa8d8
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
config/Config-kernel.in
View file

@ -551,3 +551,26 @@ config KERNEL_SECCOMP
default n default n
help help
Build kernel with support for seccomp. Build kernel with support for seccomp.
#
# IPv6 configuration
#
config KERNEL_IPV6
def_bool IPV6
if KERNEL_IPV6
config KERNEL_IPV6_MULTIPLE_TABLES
def_bool y
config KERNEL_IPV6_SUBTREES
def_bool y
config KERNEL_IPV6_MROUTE
def_bool y
config KERNEL_IPV6_PIMSM_V2
def_bool n
endif

22
package/kernel/linux/modules/netsupport.mk
View file

@ -454,28 +454,6 @@ endef
$(eval $(call KernelPackage,iptunnel6)) $(eval $(call KernelPackage,iptunnel6))
define KernelPackage/ipv6
SUBMENU:=$(NETWORK_SUPPORT_MENU)
TITLE:=IPv6 support
DEPENDS:=@IPV6
HIDDEN:=1
DEFAULT:=y
KCONFIG:= \
CONFIG_IPV6=y \
CONFIG_IPV6_PRIVACY=y \
CONFIG_IPV6_MULTIPLE_TABLES=y \
CONFIG_IPV6_MROUTE=y \
CONFIG_IPV6_PIMSM_V2=n \
CONFIG_IPV6_SUBTREES=y
endef
define KernelPackage/ipv6/description
Kernel modules for IPv6 support
endef
$(eval $(call KernelPackage,ipv6))
define KernelPackage/sit define KernelPackage/sit
SUBMENU:=$(NETWORK_SUPPORT_MENU) SUBMENU:=$(NETWORK_SUPPORT_MENU)
DEPENDS:=@IPV6 +kmod-iptunnel +kmod-iptunnel4 DEPENDS:=@IPV6 +kmod-iptunnel +kmod-iptunnel4