[Buildroot] [PATCH] linux: enable all options needed by xtables-addons

[Buildroot] [PATCH] linux: enable all options needed by xtables-addons

[Yann E. MORIN]

Both of CONFIG_NF_CONNTRACK and CONFIG_NF_CONNTRACK_MARK are needed by
xtables-addons.

Although the current code does enable them in the linux' .config file,
the former is protected behind CONFIG_NETFILTER_ADVANCED, which may be
missing from a user-supplied (def)config file, and is missing from some
of the bundled defconfigs as well.

For example, the following defconfig fails to build:

    BR2_TOOLCHAIN_EXTERNAL=y
    BR2_LINUX_KERNEL=y
    BR2_LINUX_KERNEL_DEFCONFIG="i386"
    BR2_PACKAGE_XTABLES_ADDONS=y

So, also force-enable CONFIG_NETFILTER_ADVANCED.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
 linux/linux.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/linux/linux.mk b/linux/linux.mk
index d91dbb2..48f9c74 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -215,6 +215,7 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES,$(@D)/.config))
 	$(if $(BR2_PACKAGE_XTABLES_ADDONS),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK,$(@D)/.config))
 	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
-- 
1.9.1

[Buildroot] [PATCH] linux: enable all options needed by xtables-addons

[Thomas Petazzoni]

Dear Yann E. MORIN,

On Fri, 21 Aug 2015 23:58:29 +0200, Yann E. MORIN wrote:
> Both of CONFIG_NF_CONNTRACK and CONFIG_NF_CONNTRACK_MARK are needed by
> xtables-addons.
> 
> Although the current code does enable them in the linux' .config file,
> the former is protected behind CONFIG_NETFILTER_ADVANCED, which may be
> missing from a user-supplied (def)config file, and is missing from some
> of the bundled defconfigs as well.
> 
> For example, the following defconfig fails to build:
> 
>     BR2_TOOLCHAIN_EXTERNAL=y
>     BR2_LINUX_KERNEL=y
>     BR2_LINUX_KERNEL_DEFCONFIG="i386"
>     BR2_PACKAGE_XTABLES_ADDONS=y
> 
> So, also force-enable CONFIG_NETFILTER_ADVANCED.
> 
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> ---
>  linux/linux.mk | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com