package/wireguard-linux-compat: bear the kernel options munging

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index e10e2a466b0f228240924af627586f6071f96b97..71495de1438247b4939f9aea3b0ed6741c1e6d0c 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -357,12 +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_WIREGUARD_LINUX_COMPAT),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_INET)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER))
        $(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
                $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB))
        $(if $(BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV),

diff --git a/package/wireguard-linux-compat/wireguard-linux-compat.mk b/package/wireguard-linux-compat/wireguard-linux-compat.mk
index 27f5981ae33acb0d81ac62d20d683be1e1c81685..6d90245bd2e6fec4976fedfccb3b9856ff301cc5 100644 (file)
--- a/package/wireguard-linux-compat/wireguard-linux-compat.mk
+++ b/package/wireguard-linux-compat/wireguard-linux-compat.mk
@@ -11,5 +11,13 @@ WIREGUARD_LINUX_COMPAT_LICENSE = GPL-2.0
 WIREGUARD_LINUX_COMPAT_LICENSE_FILES = COPYING
 WIREGUARD_LINUX_COMPAT_MODULE_SUBDIRS = src
 
+define WIREGUARD_LINUX_COMPAT_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_INET)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NET)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_NET_FOU)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_CRYPTO_MANAGER)
+endef
+
 $(eval $(kernel-module))
 $(eval $(generic-package))