Skip to contentSkip to conversation

package/linux-tools/perf: bear the kernel options munging

PATCH New Yann E. MORIN 2 participants 2 messages May 1, 2020 – May 31, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/linux-tools/perf: bear the kernel options munging

perf by itself is not a standalone package; instead, it is part of a bigger package, linux-tools.

Even though perf is the only one to need kernel .config fixups, we still do it in a generic way, as it blends nicely in the existing variables, which all use a loop over all the tools.

Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- really call PERF_LINUX_CONFIG_FIXUPS (Thomas)
- expand commit log accordingly

---
 linux/linux.mk                            | 2 --
 package/linux-tools/linux-tool-perf.mk.in | 4 ++++
 package/linux-tools/linux-tools.mk        | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
linux/linux.mk +0 -2
index 69bbad99e1..60dc343efa 100644
@@ -355,8 +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_LINUX_TOOLS_PERF),
-		$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS))
 	$(if $(BR2_LINUX_KERNEL_APPENDED_DTB),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_ARM_APPENDED_DTB))
 	$(if $(LINUX_KERNEL_CUSTOM_LOGO_PATH),
package/linux-tools/linux-tool-perf.mk.in +4 -0
index 7106b622cb..53b7c5b9cd 100644
@@ -158,3 +158,7 @@ define PERF_INSTALL_TARGET_CMDS
 	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/
 	$(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/
 endef
+
+define PERF_LINUX_CONFIG_FIXUPS
+	$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS)
+endef
package/linux-tools/linux-tools.mk +7 -0
index 65d9e850e0..81b1fbc176 100644
@@ -42,6 +42,13 @@ LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\
 	$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
 		$(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS))
 
+define LINUX_TOOLS_LINUX_CONFIG_FIXUPS
+	$(foreach tool,$(LINUX_TOOLS),\
+		$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
+			$($(call UPPERCASE,$(tool))_LINUX_CONFIG_FIXUPS))
+	)
+endef
+
 define LINUX_TOOLS_INSTALL_INIT_SYSTEMD
 	$(foreach tool,$(LINUX_TOOLS),\
 		$(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 package/linux-tools/perf: bear the kernel options munging

Quoted 14 lines · On Fri, 1 May 2020 18:22:16 +0200 "Yann E. MORIN" <[email protected]>…

perf by itself is not a standalone package; instead, it is part of a bigger package, linux-tools.

Even though perf is the only one to need kernel .config fixups, we still do it in a generic way, as it blends nicely in the existing variables, which all use a loop over all the tools.

Cc Thomas Petazzoni <[email protected]>

---
Changes v1 -> v2:
- really call PERF_LINUX_CONFIG_FIXUPS (Thomas)
- expand commit log accordingly

Quoted 5 lines
---
 linux/linux.mk                            | 2 --
 package/linux-tools/linux-tool-perf.mk.in | 4 ++++
 package/linux-tools/linux-tools.mk        | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

Applied to next, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com