[12/22] package/ktap: bear the kernel options munging

Message ID	d2d9bfee9725f3b234cdcfe66c9a284d439b3067.1586002215.git.yann.morin.1998@free.fr
State	Accepted
Headers	show Return-Path: <buildroot-bounces@busybox.net> From: "Yann E. MORIN" <yann.morin.1998@free.fr> To: buildroot@buildroot.org Date: Sat, 4 Apr 2020 14:10:24 +0200 Message-Id: <d2d9bfee9725f3b234cdcfe66c9a284d439b3067.1586002215.git.yann.morin.1998@free.fr> In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr> References: <cover.1586002215.git.yann.morin.1998@free.fr> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 12/22] package/ktap: bear the kernel options munging Precedence: list Cc: Anders Darander <anders@chargestorm.se>, "Yann E. MORIN" <yann.morin.1998@free.fr> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" <buildroot-bounces@busybox.net>
Series	[01/22] core/pkg-utils: rationalise kconfig option mangling \| expand [01/22] core/pkg-utils: rationalise kconfig option mangling [02/22] core/pkg-utils: kconfig mangling defaults to current package's .config [04/22] boot/uboot: don't specify .config to munge [05/22] boot/busybox: don't specify .config to munge [06/22] boot/swupdate: don't specify .config to munge [07/22] boot/uclibc: don't specify .config to munge [08/22] linux: don't specify .config to munge [09/22] linux: allow packages to set options [10/22] package/audit: bear the kernel options munging [11/22] package/intel-micro-code: bear the kernel options munging [12/22] package/ktap: bear the kernel options munging [13/22] package/pcm-tools: bear the kernel options munging [14/22] package/linux-tools/perf: bear the kernel options munging [15/22] package/systemd: bear the kernel options munging [16/22] package/smack: bear the kernel options munging [17/22] package/sunxi-mali-mainline-driver: bear the kernel options munging [18/22] package/iptables: bear the kernel options munging [19/22] package/xtables-addons: bear the kernel options munging [20/22] package/wireguard-linux-compat: bear the kernel options munging [21/22] package/libselinux: bear the kernel options munging [22/22] package/kernel-module-imx-gpu-viv: bear the kernel options munging

Message ID

d2d9bfee9725f3b234cdcfe66c9a284d439b3067.1586002215.git.yann.morin.1998@free.fr

State

Accepted

Headers

From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: buildroot@buildroot.org
Date: Sat,  4 Apr 2020 14:10:24 +0200
Message-Id: <d2d9bfee9725f3b234cdcfe66c9a284d439b3067.1586002215.git.yann.morin.1998@free.fr>
In-Reply-To: <cover.1586002215.git.yann.morin.1998@free.fr>
References: <cover.1586002215.git.yann.morin.1998@free.fr>
MIME-Version: 1.0
Subject: [Buildroot] [PATCH 12/22] package/ktap: bear the kernel options
	munging
Precedence: list
Cc: Anders Darander <anders@chargestorm.se>,
	"Yann E. MORIN" <yann.morin.1998@free.fr>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: buildroot-bounces@busybox.net
Sender: "buildroot" <buildroot-bounces@busybox.net>

Series

[01/22] core/pkg-utils: rationalise kconfig option mangling | expand

Commit Message

Yann E. MORIN April 4, 2020, 12:10 p.m. UTC

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Anders Darander <anders@chargestorm.se>
---
 linux/linux.mk       | 5 -----
 package/ktap/ktap.mk | 7 +++++++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 65cfa5d7ad..157808a49d 100644
--- 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 3b9134da65..09daba5c53 100644
--- 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))

[12/22] package/ktap: bear the kernel options munging

Commit Message

Patch