From df988d40e7fb1f350679fb6d0329364f9f011c66 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 4 Apr 2020 14:10:25 +0200 Subject: [PATCH] package/pcm-tools: bear the kernel options munging Signed-off-by: Yann E. MORIN Cc: Carlos Santos Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 2 -- package/pcm-tools/pcm-tools.mk | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/linux/linux.mk b/linux/linux.mk index 9ba75f3956..1bf7932a55 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -357,8 +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_PCM_TOOLS), - $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR)) $(if $(BR2_PACKAGE_SYSTEMD), $(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS) $(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER) diff --git a/package/pcm-tools/pcm-tools.mk b/package/pcm-tools/pcm-tools.mk index 6d5938f94e..6de11c0da2 100644 --- a/package/pcm-tools/pcm-tools.mk +++ b/package/pcm-tools/pcm-tools.mk @@ -33,4 +33,8 @@ define PCM_TOOLS_INSTALL_TARGET_CMDS $(PCM_TOOLS_INSTALL_PMU_QUERY) endef +define PCM_TOOLS_LINUX_CONFIG_FIXUPS + $(call KCONFIG_ENABLE_OPT,CONFIG_X86_MSR) +endef + $(eval $(generic-package)) -- 2.30.2