| 1 |
commit: 5356a6ae47841e901c95add5adee87dd49f2ba74 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jan 24 23:24:37 2018 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jan 24 23:25:26 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5356a6ae |
| 7 |
|
| 8 |
sys-power/powertop: only check TIMER_STATS on <linux-4.11 #629908 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/629908 |
| 11 |
|
| 12 |
sys-power/powertop/powertop-2.8.ebuild | 9 ++++++--- |
| 13 |
sys-power/powertop/powertop-9999.ebuild | 9 ++++++--- |
| 14 |
2 files changed, 12 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-power/powertop/powertop-2.8.ebuild b/sys-power/powertop/powertop-2.8.ebuild |
| 17 |
index ab67bbf8ed9..e0975e47ca8 100644 |
| 18 |
--- a/sys-power/powertop/powertop-2.8.ebuild |
| 19 |
+++ b/sys-power/powertop/powertop-2.8.ebuild |
| 20 |
@@ -45,7 +45,6 @@ pkg_setup() { |
| 21 |
~CPU_FREQ_GOV_ONDEMAND |
| 22 |
~FTRACE |
| 23 |
~BLK_DEV_IO_TRACE |
| 24 |
- ~TIMER_STATS |
| 25 |
~TRACING |
| 26 |
" |
| 27 |
ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it" |
| 28 |
@@ -58,8 +57,7 @@ pkg_setup() { |
| 29 |
ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function" |
| 30 |
ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function" |
| 31 |
ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE" |
| 32 |
- 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" |
| 33 |
- ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function" |
| 34 |
+ ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options" |
| 35 |
ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function" |
| 36 |
linux-info_pkg_setup |
| 37 |
if linux_config_exists; then |
| 38 |
@@ -84,6 +82,11 @@ pkg_setup() { |
| 39 |
ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function" |
| 40 |
check_extra_config |
| 41 |
fi |
| 42 |
+ if kernel_is -lt 4 11; then |
| 43 |
+ CONFIG_CHECK="~TIMER_STATS" |
| 44 |
+ ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function" |
| 45 |
+ check_extra_config |
| 46 |
+ fi |
| 47 |
fi |
| 48 |
} |
| 49 |
|
| 50 |
|
| 51 |
diff --git a/sys-power/powertop/powertop-9999.ebuild b/sys-power/powertop/powertop-9999.ebuild |
| 52 |
index 8d4d40d26b9..923a9055543 100644 |
| 53 |
--- a/sys-power/powertop/powertop-9999.ebuild |
| 54 |
+++ b/sys-power/powertop/powertop-9999.ebuild |
| 55 |
@@ -49,7 +49,6 @@ pkg_setup() { |
| 56 |
~CPU_FREQ_GOV_ONDEMAND |
| 57 |
~FTRACE |
| 58 |
~BLK_DEV_IO_TRACE |
| 59 |
- ~TIMER_STATS |
| 60 |
~TRACING |
| 61 |
" |
| 62 |
ERROR_KERNEL_X86_MSR="X86_MSR is not enabled in the kernel, you almost certainly need it" |
| 63 |
@@ -62,8 +61,7 @@ pkg_setup() { |
| 64 |
ERROR_KERNEL_CPU_FREQ_STAT="CPU_FREQ_STAT should be enabled in the kernel for full powertop function" |
| 65 |
ERROR_KERNEL_CPU_FREQ_GOV_ONDEMAND="CPU_FREQ_GOV_ONDEMAND should be enabled in the kernel for full powertop function" |
| 66 |
ERROR_KERNEL_FTRACE="FTRACE needs to be turned on to enable BLK_DEV_IO_TRACE" |
| 67 |
- 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" |
| 68 |
- ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function" |
| 69 |
+ ERROR_KERNEL_BLK_DEV_IO_TRACE="BLK_DEV_IO_TRACE needs to be turned on to enable other config options" |
| 70 |
ERROR_KERNEL_TRACING="TRACING should be enabled in the kernel for full powertop function" |
| 71 |
linux-info_pkg_setup |
| 72 |
if linux_config_exists; then |
| 73 |
@@ -88,6 +86,11 @@ pkg_setup() { |
| 74 |
ERROR_KERNEL_PM="PM should be enabled in the kernel for full powertop function" |
| 75 |
check_extra_config |
| 76 |
fi |
| 77 |
+ if kernel_is -lt 4 11; then |
| 78 |
+ CONFIG_CHECK="~TIMER_STATS" |
| 79 |
+ ERROR_KERNEL_TIMER_STATS="TIMER_STATS should be enabled in the kernel for full powertop function" |
| 80 |
+ check_extra_config |
| 81 |
+ fi |
| 82 |
fi |
| 83 |
} |
Archives