On 22/09/2015 19:31, Arjen de Korte wrote:
> 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
> https://github.com/torvalds/linux/commit/5d9efa7ee99eed58388f186c13cf2e2a87e9ceb4
>
> Signed-off-by: Arjen de Korte <[email protected]>
> ---
> config/Config-kernel.in | 23 +++++++++++++++++++++++
> package/kernel/linux/modules/netsupport.mk | 22 ----------------------
> 2 files changed, 23 insertions(+), 22 deletions(-)
>
> diff --git a/config/Config-kernel.in b/config/Config-kernel.in
> index 2572bf4..4082e1e 100644
> --- a/config/Config-kernel.in
> +++ b/config/Config-kernel.in
> @@ -544,3 +544,26 @@ config KERNEL_SECCOMP
> default n
> help
> 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
> diff --git a/package/kernel/linux/modules/netsupport.mk
> b/package/kernel/linux/modules/netsupport.mk
> index b81d9b4..7a7ca43 100644
> --- a/package/kernel/linux/modules/netsupport.mk
> +++ b/package/kernel/linux/modules/netsupport.mk
> @@ -453,28 +453,6 @@ endef
> $(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))
> -
> -
this will break all targets still on v3.18
John
> define KernelPackage/sit
> SUBMENU:=$(NETWORK_SUPPORT_MENU)
> DEPENDS:=@IPV6 +kmod-iptunnel +kmod-iptunnel4
>
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
