diff --git a/cpupower-4.15.tar.bz2 b/cpupower-4.15.tar.bz2 deleted file mode 100644 index 2dd0dae..0000000 --- a/cpupower-4.15.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae1259669ae3a8dd9c7d7ab47fa5d4570d287046c011d82a1976ef8738763031 -size 72292 diff --git a/cpupower-4.19.tar.bz2 b/cpupower-4.19.tar.bz2 new file mode 100644 index 0000000..7419156 --- /dev/null +++ b/cpupower-4.19.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de5a9ad7ddf52172e98a32492657dfaaefcd51168babb0bc32e95ae82b4e6cd5 +size 72395 diff --git a/cpupower.changes b/cpupower.changes index facc901..b74d622 100644 --- a/cpupower.changes +++ b/cpupower.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Oct 1 13:59:45 UTC 2018 - trenn@suse.de + +- Updating to latest 4.19(-rc6) kernel sources + Turbostat is increased to version 18.07.27 by this + Patches which got deleted because they are now mainline: +D turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch +D turbostat_fix_man_perm.patch +D x86_perf_fix_man_permissions.patch + ------------------------------------------------------------------- Thu Jan 11 16:00:56 UTC 2018 - trenn@suse.de diff --git a/cpupower.spec b/cpupower.spec index f5c7b6d..074b80b 100644 --- a/cpupower.spec +++ b/cpupower.spec @@ -20,9 +20,9 @@ Name: cpupower # Use this as version when things are in mainline kernel %define version %(rpm -q --qf '%VERSION' kernel-source) -Version: 4.15 +Version: 4.19 Release: 0 -%define tsversion 17.04.12 +%define tsversion 18.07.27 %define pbversion 17.05.11 Summary: Tools to determine and set CPU Power related Settings License: GPL-2.0 @@ -37,13 +37,9 @@ Patch1: cpupower_rapl.patch Patch2: rapl_monitor.patch Patch3: cpupower_exclude_kernel_Makefile.patch -Patch20: turbostat_fix_man_perm.patch Patch22: turbostat_makefile_fix_asm_header.patch # Fixes bsc#1048546: -Patch23: turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch - Patch30: x86_perf_makefile_fix_asm_header.patch -Patch31: x86_perf_fix_man_permissions.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: gettext-tools @@ -94,13 +90,10 @@ powersave module. %patch3 -p1 cd ../turbostat-%tsversion -%patch20 -p1 %patch22 -p1 -%patch23 -p1 cd ../x86_energy_perf_policy-%{pbversion} %patch30 -p1 -%patch31 -p1 %build # This package failed when testing with -Wl,-as-needed being default. diff --git a/cpupower_export_tarball_from_git.sh b/cpupower_export_tarball_from_git.sh index 3744d46..8298df5 100644 --- a/cpupower_export_tarball_from_git.sh +++ b/cpupower_export_tarball_from_git.sh @@ -72,9 +72,9 @@ function export_cpupower() { # Tried to do this with one git archive command, but # --remote= param seem not to be configured for kernel.org gits - +set -x git archive --format=tar $GIT_TAG tools/power/cpupower |tar -x - +set +x mv tools/power/cpupower cpupower-${VERSION} tar -cvjf cpupower-${VERSION}.tar.bz2 cpupower-${VERSION} popd diff --git a/turbostat-17.04.12.tar.bz2 b/turbostat-17.04.12.tar.bz2 deleted file mode 100644 index dc6efe5..0000000 --- a/turbostat-17.04.12.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c848b38d108a37767a5a7b9ba09360e98d56e100466d0474036bbf55792464b7 -size 37757 diff --git a/turbostat-18.07.27.tar.bz2 b/turbostat-18.07.27.tar.bz2 new file mode 100644 index 0000000..ea3f103 --- /dev/null +++ b/turbostat-18.07.27.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c02cf45e2890f33784351b8fc9903b1fe497884d8e0a9bb28119db72a04b952a +size 41872 diff --git a/turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch b/turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch deleted file mode 100644 index 317f9b2..0000000 --- a/turbostat_decode_MSR_IA32_MISC_ENABLE_only_on_Intel.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: turbostat-17.04.12/turbostat.c -=================================================================== ---- turbostat-17.04.12.orig/turbostat.c -+++ turbostat-17.04.12/turbostat.c -@@ -3895,6 +3895,9 @@ void decode_misc_enable_msr(void) - { - unsigned long long msr; - -+ if (!genuine_intel) -+ return; -+ - if (!get_msr(base_cpu, MSR_IA32_MISC_ENABLE, &msr)) - fprintf(outf, "cpu%d: MSR_IA32_MISC_ENABLE: 0x%08llx (%sTCC %sEIST %sMWAIT %sPREFETCH %sTURBO)\n", - base_cpu, msr, diff --git a/turbostat_fix_man_perm.patch b/turbostat_fix_man_perm.patch deleted file mode 100644 index ddb965e..0000000 --- a/turbostat_fix_man_perm.patch +++ /dev/null @@ -1,10 +0,0 @@ -Index: turbostat-4.16/Makefile -=================================================================== ---- turbostat-4.16.orig/Makefile 2017-02-19 23:34:00.000000000 +0100 -+++ turbostat-4.16/Makefile 2017-03-22 19:21:43.638618401 +0100 -@@ -24,4 +24,4 @@ install : turbostat - install -d $(DESTDIR)$(PREFIX)/bin - install $(BUILD_OUTPUT)/turbostat $(DESTDIR)$(PREFIX)/bin/turbostat - install -d $(DESTDIR)$(PREFIX)/share/man/man8 -- install turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 -+ install -m 0644 turbostat.8 $(DESTDIR)$(PREFIX)/share/man/man8 diff --git a/x86_energy_perf_policy-17.05.11.tar.bz2 b/x86_energy_perf_policy-17.05.11.tar.bz2 index 41f1e74..f49ca68 100644 --- a/x86_energy_perf_policy-17.05.11.tar.bz2 +++ b/x86_energy_perf_policy-17.05.11.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5237f2407c9bff1d9b4a3e516a0a7b877aeb48ad1ffeddb59070565711e55a49 -size 17578 +oid sha256:0e9ba4c15f05a28992d429bf23d8ea97a8924e0dda375b535a7c8e9d0ed91a9f +size 18102 diff --git a/x86_perf_fix_man_permissions.patch b/x86_perf_fix_man_permissions.patch deleted file mode 100644 index fd98a81..0000000 --- a/x86_perf_fix_man_permissions.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: x86_energy_perf_policy-17.05.11/Makefile -=================================================================== ---- x86_energy_perf_policy-17.05.11.orig/Makefile 2018-01-09 16:59:12.831811429 +0100 -+++ x86_energy_perf_policy-17.05.11/Makefile 2018-01-09 16:59:33.133035858 +0100 -@@ -24,5 +24,5 @@ install : x86_energy_perf_policy - install -d $(DESTDIR)$(PREFIX)/bin - install $(BUILD_OUTPUT)/x86_energy_perf_policy $(DESTDIR)$(PREFIX)/bin/x86_energy_perf_policy - install -d $(DESTDIR)$(PREFIX)/share/man/man8 -- install x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 -+ install -m 644 x86_energy_perf_policy.8 $(DESTDIR)$(PREFIX)/share/man/man8 -