package/ktap: bear the kernel options munging

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Anders Darander <anders@chargestorm.se>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/linux/linux.mk b/linux/linux.mk
index 25443c608eaff3ad846a8bb8439f8316095218c3..9ba75f395617008a3b4e35b9cd707b53dd1b9c46 100644 (file)
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -355,11 +355,6 @@ define LINUX_KCONFIG_FIXUP_CMDS
                $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER))
        $(if $(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),
                $(call KCONFIG_ENABLE_OPT,CONFIG_NET))
-       $(if $(BR2_PACKAGE_KTAP),
-               $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS)
-               $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER))
        $(if $(BR2_PACKAGE_LINUX_TOOLS_PERF),
                $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS))
        $(if $(BR2_PACKAGE_PCM_TOOLS),

diff --git a/package/ktap/ktap.mk b/package/ktap/ktap.mk
index 3b9134da658e1c015df784e00a95ffcfc7419c66..09daba5c534e4413efc8ccadaa6841e2551fb019 100644 (file)
--- a/package/ktap/ktap.mk
+++ b/package/ktap/ktap.mk
@@ -25,5 +25,12 @@ endef
 
 KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED)
 
+define KTAP_LINUX_CONFIG_FIXUPS
+       $(call KCONFIG_ENABLE_OPT,CONFIG_DEBUG_FS)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS)
+       $(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER)
+endef
+
 $(eval $(kernel-module))
 $(eval $(generic-package))