aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2020-04-04 14:10:30 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2020-05-01 15:50:29 +0200
commitee07995ac52d8f1c17b6855cac0e530b24bd5946 (patch)
treee2344ab409ad7e443b7393ba8c4378009315beeb
parent1b4a2bd8e402a3b0936cdc6094d93fb2a068a603 (diff)
downloadbuildroot-ee07995ac52d8f1c17b6855cac0e530b24bd5946.tar.gz
buildroot-ee07995ac52d8f1c17b6855cac0e530b24bd5946.tar.bz2
package/iptables: bear the kernel options munging
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--linux/linux.mk5
-rw-r--r--package/iptables/iptables.mk7
2 files changed, 7 insertions, 5 deletions
diff --git a/linux/linux.mk b/linux/linux.mk
index 8867be44f7..14dc78fc9e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -357,11 +357,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
$(call KCONFIG_ENABLE_OPT,CONFIG_NET))
$(if $(BR2_PACKAGE_LINUX_TOOLS_PERF),
$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS))
- $(if $(BR2_PACKAGE_IPTABLES),
- $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES)
- $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER)
- $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER)
- $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES))
$(if $(BR2_PACKAGE_XTABLES_ADDONS),
$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED)
$(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK)
diff --git a/package/iptables/iptables.mk b/package/iptables/iptables.mk
index ae5cf4ddd3..7b964aaf41 100644
--- a/package/iptables/iptables.mk
+++ b/package/iptables/iptables.mk
@@ -47,4 +47,11 @@ else
IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy
endif
+define IPTABLES_LINUX_CONFIG_FIXUPS
+ $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_IPTABLES)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_IP_NF_FILTER)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER)
+ $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_XTABLES)
+endef
+
$(eval $(autotools-package))