powertop: upgrade 2.14 -> 2.15

0001-src-fix-compatibility-with-ncurses-6.3.patch
removed since it's included in new version.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch b/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch
deleted file mode 100644 (file)
index 84b05ac..0000000
--- a/meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 76d3f0851520bc8488e432f423941f1e72cc7405 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Mon, 25 Oct 2021 17:47:23 +0200
-Subject: [PATCH] src: fix compatibility with ncurses 6.3
-
-Upstream-Status: Submitted [https://github.com/fenrus75/powertop/pull/92]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/devices/devfreq.cpp | 2 +-
- src/display.cpp         | 2 +-
- src/lib.cpp             | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/devices/devfreq.cpp b/src/devices/devfreq.cpp
-index 0509d0f..b194ac4 100644
---- a/src/devices/devfreq.cpp
-+++ b/src/devices/devfreq.cpp
-@@ -297,7 +297,7 @@ void display_devfreq_devices(void)
-                       df->fill_freq_utilization(j, buf);
-                       strcat(fline, buf);
-                       strcat(fline, "\n");
--                      wprintw(win, fline);
-+                      wprintw(win, "%s", fline);
-               }
-               wprintw(win, "\n");
-       }
-diff --git a/src/display.cpp b/src/display.cpp
-index 7131144..cc03919 100644
---- a/src/display.cpp
-+++ b/src/display.cpp
-@@ -125,7 +125,7 @@ void show_tab(unsigned int tab)
- 
-       c = bottom_lines[tab_names[tab]].c_str();
-       if (c && strlen(c) > 0)
--              mvwprintw(bottom_line, 0,0, c);
-+              mvwprintw(bottom_line, 0,0, "%s", c);
-       else
-               mvwprintw(bottom_line, 0, 0,
-                       "<ESC> %s | <TAB> / <Shift + TAB> %s | ", _("Exit"),
-diff --git a/src/lib.cpp b/src/lib.cpp
-index 5e48f37..5cd1c4a 100644
---- a/src/lib.cpp
-+++ b/src/lib.cpp
-@@ -583,7 +583,7 @@ void ui_notify_user_ncurses(const char *frmt, ...)
-        * buffer */
-       vsnprintf(notify, UI_NOTIFY_BUFF_SZ - 1, frmt, list);
-       va_end(list);
--      mvprintw(1, 0, notify);
-+      mvprintw(1, 0, "%s", notify);
-       attroff(COLOR_PAIR(1));
- }
- 

diff --git a/meta/recipes-kernel/powertop/powertop_2.14.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb
similarity index 87%
rename from meta/recipes-kernel/powertop/powertop_2.14.bb
rename to meta/recipes-kernel/powertop/powertop_2.15.bb
index a2f30040b53224db6ed36667d4999b745922d24e..0aae4c9397805d88d5aa7b6d8089bf26adbb61a5 100644 (file)
--- a/meta/recipes-kernel/powertop/powertop_2.14.bb
+++ b/meta/recipes-kernel/powertop/powertop_2.15.bb
@@ -8,9 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
 
 SRC_URI = "git://github.com/fenrus75/powertop;protocol=https;branch=master \
            file://0001-wakeup_xxx.h-include-limits.h.patch \
-           file://0001-src-fix-compatibility-with-ncurses-6.3.patch \
            "
-SRCREV = "52f022f9bbe6e060fba11701d657a8d9762702ba"
+SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651"
 
 S = "${WORKDIR}/git"