Accepting request 807180 from hardware

OBS-URL: https://build.opensuse.org/request/show/807180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cpupower?expand=0&rev=47

cpupower.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue May 19 09:21:48 UTC 2020 - Thomas Renninger <trenn@suse.de>
+
+- Update to latest:
+  turbostat 20.03.20
+  intel-speed-select 1.3  (bsc#1171810)
+  verions
+- Adjust needed kernel and userspace requirements in:
+  cpupower_export_tarball_from_git.sh
+  and
+  BuildRequires: libcap-devel
+A remove_bits_h.patch
+
 -------------------------------------------------------------------
 Thu Mar  5 09:45:02 UTC 2020 - Thomas Renninger <trenn@suse.de>
 

cpupower.spec

@@ -20,9 +20,9 @@
 # Use this as version when things are in mainline kernel
 %define version %(rpm -q --qf '%{VERSION}' kernel-source)
 
-%define tsversion      19.08.31
+%define tsversion      20.03.20
 %define pbversion      17.05.11
-%define ssversion      1.0
+%define ssversion      1.3
 
 Name:           cpupower
 # Use this as version when things are in mainline kernel
@@ -48,6 +48,7 @@ Patch6:         amd_do_not_show_amount_of_boost_states_if_zero.patch
 
 #turbostat patches
 Patch22:        turbostat_makefile_fix_asm_header.patch
+Patch23:        remove_bits_h.patch
 
 # x86_energy_perf patches
 # Fixes bsc#1048546:
@@ -57,6 +58,7 @@ Patch30:        x86_perf_makefile_fix_asm_header.patch
 Patch50:        intel-speed-select_remove_DATE_TIME.patch
 
 BuildRequires:  gettext-tools
+BuildRequires:  libcap-devel
 BuildRequires:  pciutils
 BuildRequires:  pciutils-devel
 
@@ -103,6 +105,7 @@ powersave module.
 
 cd ../turbostat-%{tsversion}
 %patch22 -p1
+%patch23 -p1
 
 cd ../x86_energy_perf_policy-%{pbversion}
 %patch30 -p1

cpupower_export_tarball_from_git.sh

@@ -89,11 +89,16 @@ function export_turbostat() {
     fi
     TURBOSTAT_VERSION=$(echo "-$TURBOSTAT_VERSION")
     mv tools/power/x86/turbostat turbostat${TURBOSTAT_VERSION}
-    git checkout $GIT_TAG include/linux/bits.h
+    git checkout $GIT_TAG include/uapi/linux/const.h
+    git checkout $GIT_TAG include/vdso/bits.h
+    git checkout $GIT_TAG include/vdso/const.h
     git checkout $GIT_TAG arch/x86/include/asm/msr-index.h
     git checkout $GIT_TAG arch/x86/include/asm/intel-family.h
-    mkdir -p turbostat${TURBOSTAT_VERSION}/include/linux
-    cp include/linux/bits.h turbostat${TURBOSTAT_VERSION}/include/linux/bits.h
+    mkdir -p turbostat${TURBOSTAT_VERSION}/include/uapi/linux
+    mkdir -p turbostat${TURBOSTAT_VERSION}/include/vdso
+    cp include/uapi/linux/const.h turbostat${TURBOSTAT_VERSION}/include/uapi/linux/const.h
+    cp include/vdso/bits.h turbostat${TURBOSTAT_VERSION}/include/vdso/bits.h
+    cp include/vdso/const.h turbostat${TURBOSTAT_VERSION}/include/vdso/const.h
     cp arch/x86/include/asm/intel-family.h turbostat${TURBOSTAT_VERSION}
     cp arch/x86/include/asm/msr-index.h turbostat${TURBOSTAT_VERSION}
     tar -cvjf turbostat${TURBOSTAT_VERSION}.tar.bz2 turbostat${TURBOSTAT_VERSION}

intel-speed-select-1.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:01f2f88a5cafb639d0720f25190e61f2361583da245b90460428dbc476c13df8
-size 17036

intel-speed-select-1.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:64f5db5ee2b831ebbe88f968fd9e00217613758b09de0fc282fa9a27cc79798a
+size 22313

remove_bits_h.patch

@@ -0,0 +1,15 @@
+---
+ msr-index.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/msr-index.h
++++ b/msr-index.h
+@@ -2,7 +2,7 @@
+ #ifndef _ASM_X86_MSR_INDEX_H
+ #define _ASM_X86_MSR_INDEX_H
+ 
+-#include <linux/bits.h>
++#include <vdso/bits.h>
+ 
+ /*
+  * CPU model specific register (MSR) numbers.

turbostat-19.08.31.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:07d4fdea38ce0ee2d227b9a7ad4728c921a8338192d76c359879d18d2def0950
-size 44284

turbostat-20.03.20.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:89159ac34c93da1ec7e6a671a78abec7f58524c2c7a89d279b83349849466179
+size 45070