* [PATCH] powertop: add 2.3
@ 2013-03-25 9:32 Marcin Juszkiewicz
2013-03-25 9:43 ` Paul Eggleton
0 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 9:32 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 33 -----------------
meta/recipes-kernel/powertop/powertop_1.13.bb | 41 ----------------------
meta/recipes-kernel/powertop/powertop_2.3.bb | 12 +++++++
3 files changed, 12 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
delete mode 100644 meta/recipes-kernel/powertop/powertop_1.13.bb
create mode 100644 meta/recipes-kernel/powertop/powertop_2.3.bb
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 ae4cf5d..0000000
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
-
-Running PowerTop in Poky in dump mode (with --dump) always ends with a
-segmentation fault.
-
-The cause is: in dump mode, setup_windows() is not invoked so the
-*_window variables, like cstate_window, are still NULL; later in
-main() -> show_cstates(), the functions, like wrefresh(), will trigger
-segfault.
-
-After discussing in PowerTop mailling list, I think the right solution is
-we should stub out the ncurses calls in dump mode.
-
-(The patch was also sent to upstream PowerTop mailling list.)
-
-Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
-(this patch is licensed under GPLv2)
-
---- a/display.c
-+++ b/display.c
-@@ -44,6 +44,12 @@
- static WINDOW *status_bar_window;
-
- #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
-+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
-+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
-+#define werase(win) do { if (!dump ) werase(win); } while (0)
-+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
-+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
-+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
-
- char status_bar_slots[10][40];
-
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 db54ed0..0000000
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Power usage tool"
-DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power."
-HOMEPAGE = "http://www.lesswatts.org/"
-BUGTRACKER = "http://bugzilla.lesswatts.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "virtual/libintl ncurses"
-
-# powertop 1.13 needs lspci
-RDEPENDS_${PN} = "pciutils"
-
-PR = "r4"
-
-SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
- file://stub_out_the_ncurses_calls_in_dump_mode.patch \
- "
-
-SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
-SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98"
-
-CFLAGS += "${LDFLAGS}"
-EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
-
-EXTRA_LIBS_libc-uclibc = "-lintl"
-
-do_configure() {
- # We do not build ncurses with wide char support
- sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
-
-inherit update-alternatives
-ALTERNATIVE_${PN} = "powertop"
-ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
-ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
-ALTERNATIVE_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 0000000..c289ac6
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
+HOMEPAGE = "http://01.org/powertop/"
+DEPENDS = "ncurses virtual/gettext libnl pciutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
+SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+
+inherit autotools
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH] powertop: add 2.3
2013-03-25 9:32 [PATCH] powertop: add 2.3 Marcin Juszkiewicz
@ 2013-03-25 9:43 ` Paul Eggleton
2013-03-25 9:50 ` Marcin Juszkiewicz
0 siblings, 1 reply; 13+ messages in thread
From: Paul Eggleton @ 2013-03-25 9:43 UTC (permalink / raw)
To: Marcin Juszkiewicz; +Cc: openembedded-core
On Monday 25 March 2013 10:32:08 Marcin Juszkiewicz wrote:
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> .../stub_out_the_ncurses_calls_in_dump_mode.patch | 33 -----------------
> meta/recipes-kernel/powertop/powertop_1.13.bb | 41
> ---------------------- meta/recipes-kernel/powertop/powertop_2.3.bb |
> 12 +++++++
> 3 files changed, 12 insertions(+), 74 deletions(-)
> delete mode 100644
> meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_du
> mp_mode.patch delete mode 100644
> meta/recipes-kernel/powertop/powertop_1.13.bb
> create mode 100644 meta/recipes-kernel/powertop/powertop_2.3.bb
>
> 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 ae4cf5d..0000000
> ---
> a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_
> dump_mode.patch +++ /dev/null
> @@ -1,33 +0,0 @@
> -Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be
> coming.] -
> -Running PowerTop in Poky in dump mode (with --dump) always ends with a
> -segmentation fault.
> -
> -The cause is: in dump mode, setup_windows() is not invoked so the
> -*_window variables, like cstate_window, are still NULL; later in
> -main() -> show_cstates(), the functions, like wrefresh(), will trigger
> -segfault.
> -
> -After discussing in PowerTop mailling list, I think the right solution is
> -we should stub out the ncurses calls in dump mode.
> -
> -(The patch was also sent to upstream PowerTop mailling list.)
> -
> -Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
> -(this patch is licensed under GPLv2)
> -
> ---- a/display.c
> -+++ b/display.c
> -@@ -44,6 +44,12 @@
> - static WINDOW *status_bar_window;
> -
> - #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ##
> args); else mvwprintw(win, y, x, fmt, ## args); } while (0) -+#define
> wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0) -+#define
> wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0) -+#define
> werase(win) do { if (!dump ) werase(win); } while (0)
> -+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
> -+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
> -+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
> -
> - char status_bar_slots[10][40];
> -
> 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 db54ed0..0000000
> --- a/meta/recipes-kernel/powertop/powertop_1.13.bb
> +++ /dev/null
> @@ -1,41 +0,0 @@
> -SUMMARY = "Power usage tool"
> -DESCRIPTION = "PowerTOP, a tool that helps you find what software is using
> the most power." -HOMEPAGE = "http://www.lesswatts.org/"
> -BUGTRACKER = "http://bugzilla.lesswatts.org/"
> -
> -LICENSE = "GPLv2"
> -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> -
> -DEPENDS = "virtual/libintl ncurses"
> -
> -# powertop 1.13 needs lspci
> -RDEPENDS_${PN} = "pciutils"
> -
> -PR = "r4"
> -
> -SRC_URI =
> "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz
> \ - file://stub_out_the_ncurses_calls_in_dump_mode.patch \ -
> "
> -
> -SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
> -SRC_URI[sha256sum] =
> "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98" -
> -CFLAGS += "${LDFLAGS}"
> -EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
> -
> -EXTRA_LIBS_libc-uclibc = "-lintl"
> -
> -do_configure() {
> - # We do not build ncurses with wide char support
> - sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
> -}
> -
> -do_install() {
> - oe_runmake install DESTDIR=${D}
> -}
> -
> -inherit update-alternatives
> -ALTERNATIVE_${PN} = "powertop"
> -ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
> -ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
> -ALTERNATIVE_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 0000000..c289ac6
> --- /dev/null
> +++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
> @@ -0,0 +1,12 @@
> +DESCRIPTION = "Linux tool to diagnose issues with power consumption and
> power management." +HOMEPAGE = "http://01.org/powertop/"
> +DEPENDS = "ncurses virtual/gettext libnl pciutils"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
> +
> +SRC_URI =
> "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz
> " +
> +SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
> +SRC_URI[sha256sum] =
> "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744" +
> +inherit autotools
Ah, your version misses out quite a few things from the older recipe
(alternatives, uclibc compatibility, etc.)
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH] powertop: add 2.3
2013-03-25 9:43 ` Paul Eggleton
@ 2013-03-25 9:50 ` Marcin Juszkiewicz
2013-03-25 9:53 ` Koen Kooi
` (2 more replies)
0 siblings, 3 replies; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 9:50 UTC (permalink / raw)
To: openembedded-core
W dniu 25.03.2013 10:43, Paul Eggleton pisze:
> Ah, your version misses out quite a few things from the older recipe
> (alternatives, uclibc compatibility, etc.)
What are alternatives to powertop when only powertop provides it?
I am doing uclibc build in background. Will also take care of
libncursesw -> libncurses change.
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH] powertop: add 2.3
2013-03-25 9:50 ` Marcin Juszkiewicz
@ 2013-03-25 9:53 ` Koen Kooi
2013-03-25 10:59 ` Marcin Juszkiewicz
2013-03-25 10:48 ` Marcin Juszkiewicz
2013-03-25 10:58 ` Marcin Juszkiewicz
2 siblings, 1 reply; 13+ messages in thread
From: Koen Kooi @ 2013-03-25 9:53 UTC (permalink / raw)
To: Marcin Juszkiewicz; +Cc: openembedded-core
Op 25 mrt. 2013, om 10:50 heeft Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> het volgende geschreven:
> W dniu 25.03.2013 10:43, Paul Eggleton pisze:
>
>> Ah, your version misses out quite a few things from the older recipe
>> (alternatives, uclibc compatibility, etc.)
>
> What are alternatives to powertop when only powertop provides it?
busybox, as usual :)
>
> I am doing uclibc build in background. Will also take care of
> libncursesw -> libncurses change.
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] powertop: add 2.3
2013-03-25 9:50 ` Marcin Juszkiewicz
2013-03-25 9:53 ` Koen Kooi
@ 2013-03-25 10:48 ` Marcin Juszkiewicz
2013-03-25 10:52 ` Paul Eggleton
2013-03-25 10:58 ` Marcin Juszkiewicz
2 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 10:48 UTC (permalink / raw)
To: openembedded-core
With all tweaks from 1.13:
- uclibc buildable
- libncurses instead of libncursesw
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 33 -----------------
meta/recipes-kernel/powertop/powertop_1.13.bb | 41 ----------------------
meta/recipes-kernel/powertop/powertop_2.3.bb | 22 ++++++++++++
3 files changed, 22 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
delete mode 100644 meta/recipes-kernel/powertop/powertop_1.13.bb
create mode 100644 meta/recipes-kernel/powertop/powertop_2.3.bb
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 ae4cf5d..0000000
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
-
-Running PowerTop in Poky in dump mode (with --dump) always ends with a
-segmentation fault.
-
-The cause is: in dump mode, setup_windows() is not invoked so the
-*_window variables, like cstate_window, are still NULL; later in
-main() -> show_cstates(), the functions, like wrefresh(), will trigger
-segfault.
-
-After discussing in PowerTop mailling list, I think the right solution is
-we should stub out the ncurses calls in dump mode.
-
-(The patch was also sent to upstream PowerTop mailling list.)
-
-Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
-(this patch is licensed under GPLv2)
-
---- a/display.c
-+++ b/display.c
-@@ -44,6 +44,12 @@
- static WINDOW *status_bar_window;
-
- #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
-+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
-+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
-+#define werase(win) do { if (!dump ) werase(win); } while (0)
-+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
-+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
-+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
-
- char status_bar_slots[10][40];
-
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 db54ed0..0000000
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Power usage tool"
-DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power."
-HOMEPAGE = "http://www.lesswatts.org/"
-BUGTRACKER = "http://bugzilla.lesswatts.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "virtual/libintl ncurses"
-
-# powertop 1.13 needs lspci
-RDEPENDS_${PN} = "pciutils"
-
-PR = "r4"
-
-SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
- file://stub_out_the_ncurses_calls_in_dump_mode.patch \
- "
-
-SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
-SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98"
-
-CFLAGS += "${LDFLAGS}"
-EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
-
-EXTRA_LIBS_libc-uclibc = "-lintl"
-
-do_configure() {
- # We do not build ncurses with wide char support
- sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
-
-inherit update-alternatives
-ALTERNATIVE_${PN} = "powertop"
-ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
-ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
-ALTERNATIVE_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 0000000..2a2adb4
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
+HOMEPAGE = "http://01.org/powertop/"
+DEPENDS = "ncurses virtual/gettext libnl pciutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
+SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+
+inherit autotools
+
+# we need to explicitly link with libintl in uClibc systems
+LDFLAGS += "${EXTRA_LDFLAGS}"
+EXTRA_LDFLAGS_libc-uclibc = "-lintl"
+
+# we do not want libncursesw if we can
+do_configure_prepend() {
+ # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
+ sed -i -e "s/ncursesw//g" ${S}/configure.ac
+}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH] powertop: add 2.3
2013-03-25 9:50 ` Marcin Juszkiewicz
2013-03-25 9:53 ` Koen Kooi
2013-03-25 10:48 ` Marcin Juszkiewicz
@ 2013-03-25 10:58 ` Marcin Juszkiewicz
2013-04-11 14:05 ` [PATCHv4] " Marcin Juszkiewicz
2 siblings, 1 reply; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 10:58 UTC (permalink / raw)
To: openembedded-core
With all tweaks from 1.13:
- uclibc buildable
- libncurses instead of libncursesw
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 33 -----------------
meta/recipes-kernel/powertop/powertop_1.13.bb | 41 ----------------------
meta/recipes-kernel/powertop/powertop_2.3.bb | 30 ++++++++++++++++
3 files changed, 30 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
delete mode 100644 meta/recipes-kernel/powertop/powertop_1.13.bb
create mode 100644 meta/recipes-kernel/powertop/powertop_2.3.bb
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 ae4cf5d..0000000
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
-
-Running PowerTop in Poky in dump mode (with --dump) always ends with a
-segmentation fault.
-
-The cause is: in dump mode, setup_windows() is not invoked so the
-*_window variables, like cstate_window, are still NULL; later in
-main() -> show_cstates(), the functions, like wrefresh(), will trigger
-segfault.
-
-After discussing in PowerTop mailling list, I think the right solution is
-we should stub out the ncurses calls in dump mode.
-
-(The patch was also sent to upstream PowerTop mailling list.)
-
-Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
-(this patch is licensed under GPLv2)
-
---- a/display.c
-+++ b/display.c
-@@ -44,6 +44,12 @@
- static WINDOW *status_bar_window;
-
- #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
-+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
-+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
-+#define werase(win) do { if (!dump ) werase(win); } while (0)
-+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
-+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
-+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
-
- char status_bar_slots[10][40];
-
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 db54ed0..0000000
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Power usage tool"
-DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power."
-HOMEPAGE = "http://www.lesswatts.org/"
-BUGTRACKER = "http://bugzilla.lesswatts.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "virtual/libintl ncurses"
-
-# powertop 1.13 needs lspci
-RDEPENDS_${PN} = "pciutils"
-
-PR = "r4"
-
-SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
- file://stub_out_the_ncurses_calls_in_dump_mode.patch \
- "
-
-SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
-SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98"
-
-CFLAGS += "${LDFLAGS}"
-EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
-
-EXTRA_LIBS_libc-uclibc = "-lintl"
-
-do_configure() {
- # We do not build ncurses with wide char support
- sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
-
-inherit update-alternatives
-ALTERNATIVE_${PN} = "powertop"
-ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
-ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
-ALTERNATIVE_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 0000000..d21f00d
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Power usage tool"
+DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
+HOMEPAGE = "http://01.org/powertop/"
+BUGTRACKER = "http://bugzilla.lesswatts.org/"
+DEPENDS = "ncurses virtual/gettext libnl pciutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
+SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+
+inherit autotools
+
+# we need to explicitly link with libintl in uClibc systems
+LDFLAGS += "${EXTRA_LDFLAGS}"
+EXTRA_LDFLAGS_libc-uclibc = "-lintl"
+
+# we do not want libncursesw if we can
+do_configure_prepend() {
+ # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
+ sed -i -e "s/ncursesw//g" ${S}/configure.ac
+}
+
+inherit update-alternatives
+ALTERNATIVE_${PN} = "powertop"
+ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
+ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
+ALTERNATIVE_PRIORITY = "100"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCHv4] powertop: add 2.3
2013-03-25 10:58 ` Marcin Juszkiewicz
@ 2013-04-11 14:05 ` Marcin Juszkiewicz
0 siblings, 0 replies; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-04-11 14:05 UTC (permalink / raw)
To: openembedded-core
With all tweaks from 1.13:
- uclibc buildable
- libncurses instead of libncursesw
Changes from v3:
- proper update-alternatives path
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
.../stub_out_the_ncurses_calls_in_dump_mode.patch | 33 -----------------
meta/recipes-kernel/powertop/powertop_1.13.bb | 41 ----------------------
meta/recipes-kernel/powertop/powertop_2.3.bb | 30 ++++++++++++++++
3 files changed, 30 insertions(+), 74 deletions(-)
delete mode 100644 meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
delete mode 100644 meta/recipes-kernel/powertop/powertop_1.13.bb
create mode 100644 meta/recipes-kernel/powertop/powertop_2.3.bb
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 ae4cf5d..0000000
--- a/meta/recipes-kernel/powertop/powertop-1.13/stub_out_the_ncurses_calls_in_dump_mode.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [this patch is 1.13 specific and 2.0 will be coming.]
-
-Running PowerTop in Poky in dump mode (with --dump) always ends with a
-segmentation fault.
-
-The cause is: in dump mode, setup_windows() is not invoked so the
-*_window variables, like cstate_window, are still NULL; later in
-main() -> show_cstates(), the functions, like wrefresh(), will trigger
-segfault.
-
-After discussing in PowerTop mailling list, I think the right solution is
-we should stub out the ncurses calls in dump mode.
-
-(The patch was also sent to upstream PowerTop mailling list.)
-
-Signed-off-by Dexuan Cui <dexuan.cui@intel.com>, 2010-08-20
-(this patch is licensed under GPLv2)
-
---- a/display.c
-+++ b/display.c
-@@ -44,6 +44,12 @@
- static WINDOW *status_bar_window;
-
- #define print(win, y, x, fmt, args...) do { if (dump) printf(fmt, ## args); else mvwprintw(win, y, x, fmt, ## args); } while (0)
-+#define wattrset(win, c) do { if (!dump ) wattrset(win, c); } while (0)
-+#define wbkgd(win, c) do { if (!dump ) wbkgd(win, c); } while (0)
-+#define werase(win) do { if (!dump ) werase(win); } while (0)
-+#define wrefresh(win) do { if (!dump ) wrefresh(win); } while (0)
-+#define wattron(win, a) do { if (!dump ) wattron(win, a); } while (0)
-+#define wattroff(win, a) do { if (!dump ) wattroff(win, a); } while (0)
-
- char status_bar_slots[10][40];
-
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 db54ed0..0000000
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-SUMMARY = "Power usage tool"
-DESCRIPTION = "PowerTOP, a tool that helps you find what software is using the most power."
-HOMEPAGE = "http://www.lesswatts.org/"
-BUGTRACKER = "http://bugzilla.lesswatts.org/"
-
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-DEPENDS = "virtual/libintl ncurses"
-
-# powertop 1.13 needs lspci
-RDEPENDS_${PN} = "pciutils"
-
-PR = "r4"
-
-SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
- file://stub_out_the_ncurses_calls_in_dump_mode.patch \
- "
-
-SRC_URI[md5sum] = "78aa17c8f55178004223bf236654298e"
-SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcdc58d98"
-
-CFLAGS += "${LDFLAGS}"
-EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
-
-EXTRA_LIBS_libc-uclibc = "-lintl"
-
-do_configure() {
- # We do not build ncurses with wide char support
- sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
-}
-
-do_install() {
- oe_runmake install DESTDIR=${D}
-}
-
-inherit update-alternatives
-ALTERNATIVE_${PN} = "powertop"
-ALTERNATIVE_TARGET[powertop] = "${bindir}/powertop"
-ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
-ALTERNATIVE_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 0000000..8d290d3
--- /dev/null
+++ b/meta/recipes-kernel/powertop/powertop_2.3.bb
@@ -0,0 +1,30 @@
+SUMMARY = "Power usage tool"
+DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
+HOMEPAGE = "http://01.org/powertop/"
+BUGTRACKER = "http://bugzilla.lesswatts.org/"
+DEPENDS = "ncurses virtual/gettext libnl pciutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
+SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+
+inherit autotools
+
+# we need to explicitly link with libintl in uClibc systems
+LDFLAGS += "${EXTRA_LDFLAGS}"
+EXTRA_LDFLAGS_libc-uclibc = "-lintl"
+
+# we do not want libncursesw if we can
+do_configure_prepend() {
+ # configure.ac checks for delwin() in "ncursesw ncurses" so let's drop first one
+ sed -i -e "s/ncursesw//g" ${S}/configure.ac
+}
+
+inherit update-alternatives
+ALTERNATIVE_${PN} = "powertop"
+ALTERNATIVE_TARGET[powertop] = "${sbindir}/powertop"
+ALTERNATIVE_LINK_NAME[powertop] = "${base_bindir}/powertop"
+ALTERNATIVE_PRIORITY = "100"
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH] powertop: add 2.3
@ 2013-03-25 9:25 Marcin Juszkiewicz
2013-03-25 9:30 ` Paul Eggleton
2013-03-26 6:01 ` Khem Raj
0 siblings, 2 replies; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 9:25 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
meta-oe/recipes-support/powertop/powertop_2.3.bb | 12 ++++++++++++
1 file changed, 12 insertions(+)
create mode 100644 meta-oe/recipes-support/powertop/powertop_2.3.bb
diff --git a/meta-oe/recipes-support/powertop/powertop_2.3.bb b/meta-oe/recipes-support/powertop/powertop_2.3.bb
new file mode 100644
index 0000000..c289ac6
--- /dev/null
+++ b/meta-oe/recipes-support/powertop/powertop_2.3.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
+HOMEPAGE = "http://01.org/powertop/"
+DEPENDS = "ncurses virtual/gettext libnl pciutils"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
+SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
+
+inherit autotools
--
1.8.1.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH] powertop: add 2.3
2013-03-25 9:25 [PATCH] " Marcin Juszkiewicz
@ 2013-03-25 9:30 ` Paul Eggleton
2013-03-25 9:32 ` Marcin Juszkiewicz
2013-03-26 6:01 ` Khem Raj
1 sibling, 1 reply; 13+ messages in thread
From: Paul Eggleton @ 2013-03-25 9:30 UTC (permalink / raw)
To: Marcin Juszkiewicz; +Cc: openembedded-devel
On Monday 25 March 2013 10:25:59 Marcin Juszkiewicz wrote:
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> meta-oe/recipes-support/powertop/powertop_2.3.bb | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
> create mode 100644 meta-oe/recipes-support/powertop/powertop_2.3.bb
powertop is in OE-Core, if you want to update it please update it there.
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powertop: add 2.3
2013-03-25 9:30 ` Paul Eggleton
@ 2013-03-25 9:32 ` Marcin Juszkiewicz
0 siblings, 0 replies; 13+ messages in thread
From: Marcin Juszkiewicz @ 2013-03-25 9:32 UTC (permalink / raw)
To: openembedded-devel
W dniu 25.03.2013 10:30, Paul Eggleton pisze:
> On Monday 25 March 2013 10:25:59 Marcin Juszkiewicz wrote:
>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
>> ---
>> meta-oe/recipes-support/powertop/powertop_2.3.bb | 12 ++++++++++++
>> 1 file changed, 12 insertions(+)
>> create mode 100644 meta-oe/recipes-support/powertop/powertop_2.3.bb
>
> powertop is in OE-Core, if you want to update it please update it there.
Thanks, sent.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] powertop: add 2.3
2013-03-25 9:25 [PATCH] " Marcin Juszkiewicz
2013-03-25 9:30 ` Paul Eggleton
@ 2013-03-26 6:01 ` Khem Raj
1 sibling, 0 replies; 13+ messages in thread
From: Khem Raj @ 2013-03-26 6:01 UTC (permalink / raw)
To: openembedded-devel
On Mar 25, 2013, at 2:25 AM, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> wrote:
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
> meta-oe/recipes-support/powertop/powertop_2.3.bb | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
> create mode 100644 meta-oe/recipes-support/powertop/powertop_2.3.bb
>
oe-core has powertop recipe so post a patch to upgrade OE-Core version to oe-core ml
> diff --git a/meta-oe/recipes-support/powertop/powertop_2.3.bb b/meta-oe/recipes-support/powertop/powertop_2.3.bb
> new file mode 100644
> index 0000000..c289ac6
> --- /dev/null
> +++ b/meta-oe/recipes-support/powertop/powertop_2.3.bb
> @@ -0,0 +1,12 @@
> +DESCRIPTION = "Linux tool to diagnose issues with power consumption and power management."
> +HOMEPAGE = "http://01.org/powertop/"
> +DEPENDS = "ncurses virtual/gettext libnl pciutils"
> +LICENSE = "GPLv2"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
> +
> +SRC_URI = "http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz"
> +
> +SRC_URI[md5sum] = "dc03608f20e56cdc99d121a6191556f6"
> +SRC_URI[sha256sum] = "b8c1add69afee28c77dca56fdcedb4a46820f3a71c86aae7891b0c5c595cd744"
> +
> +inherit autotools
> --
> 1.8.1.2
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2013-04-11 14:22 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-25 9:32 [PATCH] powertop: add 2.3 Marcin Juszkiewicz
2013-03-25 9:43 ` Paul Eggleton
2013-03-25 9:50 ` Marcin Juszkiewicz
2013-03-25 9:53 ` Koen Kooi
2013-03-25 10:59 ` Marcin Juszkiewicz
2013-03-25 10:48 ` Marcin Juszkiewicz
2013-03-25 10:52 ` Paul Eggleton
2013-03-25 10:58 ` Marcin Juszkiewicz
2013-04-11 14:05 ` [PATCHv4] " Marcin Juszkiewicz
-- strict thread matches above, loose matches on Subject: below --
2013-03-25 9:25 [PATCH] " Marcin Juszkiewicz
2013-03-25 9:30 ` Paul Eggleton
2013-03-25 9:32 ` Marcin Juszkiewicz
2013-03-26 6:01 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.