diff --git a/cpupower-3.14.tar.bz2 b/cpupower-3.14.tar.bz2 deleted file mode 100644 index 006be9d..0000000 --- a/cpupower-3.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73a55c6cf0701186077c087f456ddd664b6c4601532d68f4bca63eb8eab418ee -size 71414 diff --git a/cpupower.changes b/cpupower.changes index 2b2077f..205e6ce 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Aug 13 13:06:27 UTC 2014 - trenn@suse.de + +- Fix cpupower_export_tarball_from_git.sh script and make sure msr-index.h + is included in the turbostat tarball. + +------------------------------------------------------------------- +Tue Aug 12 13:49:16 UTC 2014 - trenn@suse.de + +- Update turbostat to latest 3.17 kernel version (in fact it is 3.16-rc7) + This fixes bnc#891523 + ------------------------------------------------------------------- Tue Apr 1 12:31:14 UTC 2014 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index def2a71..d04a869 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -24,7 +24,7 @@ Url: http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtil %define version %(rpm -q --qf '%{VERSION}' kernel-source) Version: 3.13 Release: 0 -%define tsversion 3.14 +%define tsversion 3.17 Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0 Group: System/Base diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh index 82e2572..0d2d00e 100644 --- a/cpupower_export_tarball_from_git.sh +++ b/cpupower_export_tarball_from_git.sh @@ -60,7 +60,8 @@ set -x git archive --format=tar $GIT_TAG tools/power/x86/turbostat |tar -x mv tools/power/x86/turbostat turbostat${VERSION} mkdir turbostat${VERSION}/asm -cp "${GIT_DIR}"/../../../../../arch/x86/include/uapi/asm/msr-index.h turbostat${VERSION}/asm +[ ! -e "$GIT_DIR"/../arch/x86/include/uapi/asm/msr-index.h ] && echo "msr-index.h does not exist" && exit 1 +cp "$GIT_DIR"/../arch/x86/include/uapi/asm/msr-index.h turbostat${VERSION}/asm tar -cvjf turbostat${VERSION}.tar.bz2 turbostat${VERSION} popd mv "$DIR/cpupower${VERSION}".tar.bz2 . diff --git a/turbostat-3.14.tar.bz2 b/turbostat-3.14.tar.bz2 deleted file mode 100644 index 12c272a..0000000 --- a/turbostat-3.14.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:25252937e79be9ce2c8f05ffad9f9502b78559df34d54d54f54c4a1d76ac8b17 -size 21870 diff --git a/turbostat-3.17.tar.bz2 b/turbostat-3.17.tar.bz2 new file mode 100644 index 0000000..ecffeb4 --- /dev/null +++ b/turbostat-3.17.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4f59526debcd30d97130f6b8d247908110a82bff60eb776e513ac998b70304da +size 21640