From ee07995ac52d8f1c17b6855cac0e530b24bd5946 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 Apr 2020 14:10:30 +0200 Subject: [PATCH] package/iptables: bear the kernel options munging Signed-off-by: Yann E. MORIN Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 5 ----- package/iptables/iptables.mk | 7 +++++++ 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)) -- 2.30.2