diff --git a/cpupower.changes b/cpupower.changes index 1361397..ee19453 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 29 15:22:48 UTC 2019 - trenn@suse.de + +- Update turbostat to latest version 19.08.31 + ------------------------------------------------------------------- Wed Jul 17 16:01:20 UTC 2019 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index 88bbb14..07865a9 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -20,7 +20,7 @@ # Use this as version when things are in mainline kernel %define version %(rpm -q --qf '%{VERSION}' kernel-source) -%define tsversion 19.03.20 +%define tsversion 19.08.31 %define pbversion 17.05.11 %define ssversion 1.0 diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh index fcb8033..225a019 100644 --- a/cpupower_export_tarball_from_git.sh +++ b/cpupower_export_tarball_from_git.sh @@ -89,8 +89,11 @@ 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 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 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} diff --git a/intel-speed-select-1.0.tar.bz2 b/intel-speed-select-1.0.tar.bz2 index de8b14a..e2a1992 100644 --- a/intel-speed-select-1.0.tar.bz2 +++ b/intel-speed-select-1.0.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:92e83b5a97b64358f1e5c5a0b5e47a2014104a9afd2df1dca7f815a5ff8f7853 -size 16246 +oid sha256:2751834c3e67715c000853315c562b4d4d7c3b77e3aca60ac38d529f6c9e44f1 +size 17036 diff --git a/turbostat-19.03.20.tar.bz2 b/turbostat-19.03.20.tar.bz2 deleted file mode 100644 index 38e3d7d..0000000 --- a/turbostat-19.03.20.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8b2855d26494b9fea63669fdaa3db3e09c86db60f3cad8b23417b0d18f73f5d0 -size 43178 diff --git a/turbostat-19.08.31.tar.bz2 b/turbostat-19.08.31.tar.bz2 new file mode 100644 index 0000000..441c1fd --- /dev/null +++ b/turbostat-19.08.31.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:07d4fdea38ce0ee2d227b9a7ad4728c921a8338192d76c359879d18d2def0950 +size 44284 diff --git a/turbostat_makefile_fix_asm_header.patch b/turbostat_makefile_fix_asm_header.patch index e80e540..4d3155c 100644 --- a/turbostat_makefile_fix_asm_header.patch +++ b/turbostat_makefile_fix_asm_header.patch @@ -1,15 +1,17 @@ -Index: turbostat-19.03.20/Makefile +Index: turbostat-19.08.31/Makefile =================================================================== ---- turbostat-19.03.20.orig/Makefile 2019-04-08 16:09:47.094469287 +0200 -+++ turbostat-19.03.20/Makefile 2019-04-08 16:10:18.490470979 +0200 -@@ -10,8 +10,8 @@ endif +--- turbostat-19.08.31.orig/Makefile 2019-10-29 15:23:56.962276473 +0100 ++++ turbostat-19.08.31/Makefile 2019-10-29 16:12:52.926434670 +0100 +@@ -9,9 +9,9 @@ ifeq ("$(origin O)", "command line") + endif turbostat : turbostat.c - override CFLAGS += -Wall +-override CFLAGS += -O2 -Wall -I../../../include -override CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"' -override CFLAGS += -DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"' ++override CFLAGS += -O2 -Wall -I ./include +override CFLAGS += -DMSRHEADER='"msr-index.h"' +override CFLAGS += -DINTEL_FAMILY_HEADER='"intel-family.h"' + override CFLAGS += -D_FORTIFY_SOURCE=2 %: %.c - @mkdir -p $(BUILD_OUTPUT)