summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorDexuan Cui <dexuan.cui@intel.com>2011-07-07 15:45:57 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-07 13:45:30 +0100
commit32c3417ac3bec18d86abcbc263d1eda8074321c0 (patch)
tree0e4cea2beb9da7ba8ede8eabb99ea821447e8265 /meta/recipes-kernel
parent04014b1da79913166303e7c90e4626c27361d392 (diff)
downloadpoky-32c3417ac3bec18d86abcbc263d1eda8074321c0.tar.gz
powertop: inherit update-alternatives and use a higher priority than busybox
busybox-1.18.4 installs /bin/powertop and the powertop recipe installs /usr/bin/powertop. So, in PATH, if /bin appears before /usr/bin, we would run the version offered by busybox, which has a very limited function (e.g., no parameter is accepted) and this causes trouble to eclipse plugin. We can use update-alternatives for powertop with higher priority to resolve the issue. Fixes [YOCTO #1208] (From OE-Core rev: e4102c3d2205371db4da7db7bca1a5853bb3c23e) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/powertop/powertop_1.13.bb8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-kernel/powertop/powertop_1.13.bb b/meta/recipes-kernel/powertop/powertop_1.13.bb
index dff4fcd27e..472a2bbcff 100644
--- a/meta/recipes-kernel/powertop/powertop_1.13.bb
+++ b/meta/recipes-kernel/powertop/powertop_1.13.bb
@@ -11,7 +11,7 @@ DEPENDS = "virtual/libintl ncurses"
11# powertop 1.13 needs lspci 11# powertop 1.13 needs lspci
12RDEPENDS_${PN} = "pciutils" 12RDEPENDS_${PN} = "pciutils"
13 13
14PR = "r0" 14PR = "r1"
15 15
16SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \ 16SRC_URI = "http://www.lesswatts.org/projects/powertop/download/powertop-${PV}.tar.gz \
17 file://stub_out_the_ncurses_calls_in_dump_mode.patch" 17 file://stub_out_the_ncurses_calls_in_dump_mode.patch"
@@ -22,6 +22,12 @@ SRC_URI[sha256sum] = "2bc866089496877dd26d2d316ad5763ab8ecb5e28aefba44bc5d355dcd
22CFLAGS += "${LDFLAGS}" 22CFLAGS += "${LDFLAGS}"
23EXTRA_OEMAKE = "VERSION=\"${PV}\"" 23EXTRA_OEMAKE = "VERSION=\"${PV}\""
24 24
25inherit update-alternatives
26ALTERNATIVE_NAME = "powertop"
27ALTERNATIVE_PATH = "${bindir}/powertop"
28ALTERNATIVE_LINK = "${base_bindir}/powertop"
29ALTERNATIVE_PRIORITY = "100"
30
25do_configure() { 31do_configure() {
26 # We do not build ncurses with wide char support 32 # We do not build ncurses with wide char support
27 sed -i -e "s/lncursesw/lncurses/" ${S}/Makefile 33 sed -i -e "s/lncursesw/lncurses/" ${S}/Makefile