From da1bb4ac5d3643e0917eb40eb4829557fd63b5d8 Mon Sep 17 00:00:00 2001 From: wangmy Date: Tue, 11 Oct 2022 16:05:58 +0800 Subject: 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 Signed-off-by: Alexandre Belloni --- ...01-src-fix-compatibility-with-ncurses-6.3.patch | 52 ---------------------- meta/recipes-kernel/powertop/powertop_2.14.bb | 25 ----------- meta/recipes-kernel/powertop/powertop_2.15.bb | 24 ++++++++++ 3 files changed, 24 insertions(+), 77 deletions(-) delete mode 100644 meta/recipes-kernel/powertop/powertop/0001-src-fix-compatibility-with-ncurses-6.3.patch delete mode 100644 meta/recipes-kernel/powertop/powertop_2.14.bb create mode 100644 meta/recipes-kernel/powertop/powertop_2.15.bb (limited to 'meta/recipes-kernel/powertop') 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 index 84b05ac971..0000000000 --- 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 -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 ---- - 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, - " %s | / %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.14.bb deleted file mode 100644 index a2f30040b5..0000000000 --- a/meta/recipes-kernel/powertop/powertop_2.14.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Power usage tool" -DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." -HOMEPAGE = "https://01.org/powertop/" -BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" -DEPENDS = "ncurses libnl pciutils autoconf-archive" -LICENSE = "GPL-2.0-only" -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" - -S = "${WORKDIR}/git" - -LDFLAGS:append = " -pthread" - -inherit autotools gettext pkgconfig bash-completion - -inherit update-alternatives -ALTERNATIVE:${PN} = "powertop" -ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop" -ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop" -ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-kernel/powertop/powertop_2.15.bb b/meta/recipes-kernel/powertop/powertop_2.15.bb new file mode 100644 index 0000000000..0aae4c9397 --- /dev/null +++ b/meta/recipes-kernel/powertop/powertop_2.15.bb @@ -0,0 +1,24 @@ +SUMMARY = "Power usage tool" +DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management." +HOMEPAGE = "https://01.org/powertop/" +BUGTRACKER = "https://app.devzing.com/powertopbugs/bugzilla" +DEPENDS = "ncurses libnl pciutils autoconf-archive" +LICENSE = "GPL-2.0-only" +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 \ + " +SRCREV = "d51ad395436d4d1dcc3ca46e1519ffeb475bf651" + +S = "${WORKDIR}/git" + +LDFLAGS:append = " -pthread" + +inherit autotools gettext pkgconfig bash-completion + +inherit update-alternatives +ALTERNATIVE:${PN} = "powertop" +ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop" +ALTERNATIVE_LINK_NAME[powertop] = "${sbindir}/powertop" +ALTERNATIVE_PRIORITY = "100" -- cgit 1.2.3-korg