summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch33
-rw-r--r--meta/recipes-kernel/powertop/powertop_1.13.bb41
-rw-r--r--meta/recipes-kernel/powertop/powertop_2.3.bb30
3 files changed, 30 insertions, 74 deletions
diff --git a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch b/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
deleted file mode 100644
index ae4cf5d8fe..0000000000
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
2
3Running PowerTop in Poky in dump mode (with --dump) always ends with a
4segmentation fault.
5
6The cause is: in dump mode, setup_windows() is not invoked so the
7*_window variables, like cstate_window, are still NULL; later in
8main() -> show_cstates(), the functions, like wrefresh(), will trigger
9segfault.
10
11After discussing in PowerTop mailling list, I think the right solution is
12we should stub out the ncurses calls in dump mode.
13
14(The patch was also sent to upstream PowerTop mailling list.)
15
16Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
17(this patch is licensed under GPLv2)
18
19--- a/display.c
20+++ b/display.c
21@@ -44,6 +44,12 @@
22 static WINDOW *status_bar_window;
23
24 #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
25+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
26+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
27+#define werase(win) do { if (!dump ) werase(win); } while (0)
28+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
29+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
30+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
31
32 char status_bar_slots[10][40];
33
diff --git a/meta/recipes-kernel/powertop/powertop_1.13.bb b/meta/recipes-kernel/powertop/powertop_1.13.bb
deleted file mode 100644
index db54ed0f59..0000000000
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1SUMMARY = "Power usage tool"
2DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power."
3HOMEPAGE = "http://www.lesswatts.org/"
4BUGTRACKER = "http://bugzilla.lesswatts.org/"
5
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
8
9DEPENDS = "virtual/libintl ncurses"
10
11# powertop 1.13 needs lspci
12RDEPENDS_${PN} = "pciutils"
13
14PR = "r4"
15
16SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
17 file://stub_out_the_ncurses_calls_in_dump_mode.patch \
18 "
19
20SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
21SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98"
22
23CFLAGS += "${LDFLAGS}"
24EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
25
26EXTRA_LIBS_libc-uclibc = "-lintl"
27
28do_configure() {
29 # We do not build ncurses with wide char support
30 sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
31}
32
33do_install() {
34 oe_runmake install DESTDIR=${D}
35}
36
37inherit update-alternatives
38ALTERNATIVE_${PN} = "powertop"
39ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
40ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
41ALTERNATIVE_PRIORITY = "100"
diff --git a/meta/recipes-kernel/powertop/powertop_2.3.bb b/meta/recipes-kernel/powertop/powertop_2.3.bb
new file mode 100644
index 0000000000..8d290d3a80
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
@@ -0,0 +1,30 @@
1SUMMARY = "Power usage tool"
2DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
3HOMEPAGE = "http://01.org/powertop/"
4BUGTRACKER = "http://bugzilla.lesswatts.org/"
5DEPENDS = "ncurses virtual/gettext libnl pciutils"
6LICENSE = "GPLv2"
7LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
8
9SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
10
11SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
12SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
13
14inherit autotools
15
16# we need to explicitly link with libintl in uClibc systems
17LDFLAGS += "${EXTRA_LDFLAGS}"
18EXTRA_LDFLAGS_libc-uclibc = "-lintl"
19
20# we do not want libncursesw if we can
21do_configure_prepend() {
22 # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
23 sed -i -e "s/ncursesw//g" ${S}/configure.ac
24}
25
26inherit update-alternatives
27ALTERNATIVE_${PN} = "powertop"
28ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop"
29ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
30ALTERNATIVE_PRIORITY = "100"