sys-power/powertop: only check TIMER_STATS on <linux-4.11 #629908

Closes: https://bugs.gentoo.org/629908

diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild
index ab67bbf8ed91efc4365fa8e558a08a223fd1be47..e0975e47ca8302d0bea9cef2e0a6ac2461cfef1b 100644 (file)
--- a/sys-power/powertop/powertop-2.8.ebuild
+++ b/sys-power/powertop/powertop-2.8.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
                ~CPU_FREQ_GOV_ONDEMAND
                ~FTRACE
                ~BLK_DEV_IO_TRACE
-               ~TIMER_STATS
                ~TRACING
        "
        ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
@@ -58,8 +57,7 @@ pkg_setup() {
        ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
        ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
        ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-       ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
-       ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+       ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
        ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
        linux-info_pkg_setup
        if linux_config_exists; then
@@ -84,6 +82,11 @@ pkg_setup() {
                        ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
                        check_extra_config
                fi
+               if kernel_is -lt 4 11; then
+                       CONFIG_CHECK="~TIMER_STATS"
+                       ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+                       check_extra_config
+               fi
        fi
 }
 

diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild
index 8d4d40d26b9385d41e2fc27eadc535b3f887a1ad..923a90555439813545b9a08a4be1d3a50911c5ce 100644 (file)
--- a/sys-power/powertop/powertop-9999.ebuild
+++ b/sys-power/powertop/powertop-9999.ebuild
@@ -49,7 +49,6 @@ pkg_setup() {
                ~CPU_FREQ_GOV_ONDEMAND
                ~FTRACE
                ~BLK_DEV_IO_TRACE
-               ~TIMER_STATS
                ~TRACING
        "
        ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it"
@@ -62,8 +61,7 @@ pkg_setup() {
        ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function"
        ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function"
        ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE"
-       ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable TIMER_STATS, TRACING and EVENT_POWER_TRACING_DEPRECATED"
-       ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+       ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options"
        ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function"
        linux-info_pkg_setup
        if linux_config_exists; then
@@ -88,6 +86,11 @@ pkg_setup() {
                        ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function"
                        check_extra_config
                fi
+               if kernel_is -lt 4 11; then
+                       CONFIG_CHECK="~TIMER_STATS"
+                       ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function"
+                       check_extra_config
+               fi
        fi
 }