package/xtables-addons: 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>

diff --git a/linux/linux.mk b/linux/linux.mk
index 14dc78fc9eea4205fa3cfcc3c7d26d211c159c28..e10e2a466b0f228240924af627586f6071f96b97 100644 (file)
--- 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_XTABLES_ADDONS),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT))
        $(if $(BR2_PACKAGE_WIREGUARD_LINUX_COMPAT),
                $(call KCONFIG_ENABLE_OPT,CONFIG_INET)
                $(call KCONFIG_ENABLE_OPT,CONFIG_NET)

diff --git a/package/xtables-addons/xtables-addons.mk b/package/xtables-addons/xtables-addons.mk
index 1a74b80f46d7180a75fc0791774f795684620a6f..dab57d980e141ac9128ca0246609b3b11e965b93 100644 (file)
--- a/package/xtables-addons/xtables-addons.mk
+++ b/package/xtables-addons/xtables-addons.mk
@@ -30,4 +30,11 @@ define XTABLES_ADDONS_INSTALL_TARGET_CMDS
        $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install
 endef
 
+define XTABLES_ADDONS_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER_ADVANCED)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NF_CONNTRACK_MARK)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NF_NAT)
+endef
+
 $(eval $(autotools-package))