diff --git a/powertop-ryzen1.patch b/powertop-ryzen1.patch deleted file mode 100644 index a46ad1e..0000000 --- a/powertop-ryzen1.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 798eb463d419941fa014ada1f863d769650351c7 Mon Sep 17 00:00:00 2001 -From: simewu -Date: Mon, 27 Sep 2021 18:25:45 -0600 -Subject: [PATCH] Patch for compatibility with Ryzen processors - ---- - src/cpu/cpu.cpp | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp -index a92f111..c09cbc5 100644 ---- a/src/cpu/cpu.cpp -+++ b/src/cpu/cpu.cpp -@@ -576,6 +576,12 @@ void report_display_cpu_cstates(void) - } - } - } else { -+ /* -+ * Patch for compatibility with Ryzen processors -+ * See https://github.com/fenrus75/powertop/issues/64 -+ */ -+ if(idx2 >= core_tbl_size.cols * core_tbl_size.rows) break; -+ - tmp_str=string(_core->fill_cstate_name(line, buffer)); - core_data[idx2]=(tmp_str=="" ? " " : tmp_str); - idx2+=1; diff --git a/powertop-ryzen2.patch b/powertop-ryzen2.patch deleted file mode 100644 index 78c7e1f..0000000 --- a/powertop-ryzen2.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5b5212d7d6e8e00925a18dc92adf0ee95249143a Mon Sep 17 00:00:00 2001 -From: Jorge Hermo Gonzalez -Date: Thu, 4 Nov 2021 10:33:10 +0100 -Subject: [PATCH] Patch for compability with Ryzen processors (v2) - ---- - src/cpu/cpu.cpp | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/cpu/cpu.cpp b/src/cpu/cpu.cpp -index c09cbc5..1c12765 100644 ---- a/src/cpu/cpu.cpp -+++ b/src/cpu/cpu.cpp -@@ -551,6 +551,12 @@ void report_display_cpu_cstates(void) - if (!_core->can_collapse()) { - buffer[0] = 0; - buffer2[0] = 0; -+ -+ /* -+ * Patch for compatibility with Ryzen processors -+ * See https://github.com/fenrus75/powertop/issues/64 -+ */ -+ if(idx2 >= core_tbl_size.cols * core_tbl_size.rows) break; - - if (line == LEVEL_HEADER) { - /* Here we need to check for which core type we -@@ -576,11 +582,7 @@ void report_display_cpu_cstates(void) - } - } - } else { -- /* -- * Patch for compatibility with Ryzen processors -- * See https://github.com/fenrus75/powertop/issues/64 -- */ -- if(idx2 >= core_tbl_size.cols * core_tbl_size.rows) break; -+ - - tmp_str=string(_core->fill_cstate_name(line, buffer)); - core_data[idx2]=(tmp_str=="" ? " " : tmp_str); diff --git a/powertop.changes b/powertop.changes index 625da04..452d3da 100644 --- a/powertop.changes +++ b/powertop.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Sep 29 14:13:21 UTC 2022 - Michael Vetter + +- Update to 2.15: + * Use autoconf archive #82 + * Patch for compatibility with Ryzen processors #91 + * src: fix compatibility with ncurses 6.3 #92 + * Fix buffer overrun #83 + * Fixed valgrind errors about uninitialized values in conditionals #87 + * Patch for compability with Ryzen processors (v2) #94 + * Add missing line breaks after error messages #96 + * Ensure that auto-tune is executed on resume as well #95 +- Drop contained patches: + * powertop-ryzen1.patch + * powertop-ryzen2.patch + ------------------------------------------------------------------- Wed Apr 20 08:14:19 UTC 2022 - Michael Vetter diff --git a/powertop.spec b/powertop.spec index eadadd5..545293c 100644 --- a/powertop.spec +++ b/powertop.spec @@ -17,7 +17,7 @@ Name: powertop -Version: 2.14 +Version: 2.15 Release: 0 Summary: A Linux Tool to Find out What is Using Power on a Laptop License: GPL-2.0-only @@ -25,9 +25,6 @@ Group: System/Monitoring URL: https://01.org/powertop/ Source0: https://github.com/fenrus75/powertop/archive/v%{version}.tar.gz Source1: powertop.service -# PATCH-FIX-UPSTREAM mvetter@suse.com -- Fix powertop Ryzen issues (bsc#1198000) -Patch0: https://github.com/fenrus75/powertop/commit/798eb463d419941fa014ada1f863d769650351c7.patch#/powertop-ryzen1.patch -Patch1: https://github.com/fenrus75/powertop/commit/5b5212d7d6e8e00925a18dc92adf0ee95249143a.patch#/powertop-ryzen2.patch # they repeatedly forget to upload a release tarball and only have the one from # GitHub which doesnt contain configure thus adding: # autoconf, autoconf-archive, automake, libtool @@ -55,8 +52,6 @@ doing in terms of power savings. %prep %setup -q -n powertop-%{version} -%patch0 -p1 -%patch1 -p1 # Delete objects files left in tarball find . -name '*.o' -delete diff --git a/v2.14.tar.gz b/v2.14.tar.gz deleted file mode 100644 index 7fcf77f..0000000 --- a/v2.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0e4cd0933a4f1fe04bfbf9d56efaabc841d9b04d391426f1a3469d6635a25f37 -size 302578 diff --git a/v2.15.tar.gz b/v2.15.tar.gz new file mode 100644 index 0000000..420bd57 --- /dev/null +++ b/v2.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e58ab3fd7b8ff5f4dd0d17f11848817e7d83c0a6918145ac81de03b5dccf8f49 +size 302891