[oe-commits] Saul Wold : powertop: cleanup update-alternatives deprecated code

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 443473a88dd94a5fe0d6bc7a5d14d45ea5bbdec5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=443473a88dd94a5fe0d6bc7a5d14d45ea5bbdec5

Author: Saul Wold <sgw at linux.intel.com>
Date:   Thu Jul 26 16:45:28 2012 -0700

powertop: cleanup update-alternatives deprecated code

Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-kernel/powertop/powertop_1.13.bb |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/meta/recipes-kernel/powertop/powertop_1.13.bb b/meta/recipes-kernel/powertop/powertop_1.13.bb
index b4f45dd..db54ed0 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"
 # powertop 1.13 needs lspci
 RDEPENDS_${PN} = "pciutils"
 
-PR = "r3"
+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 \
@@ -25,12 +25,6 @@ EXTRA_OEMAKE = "VERSION=\"${PV}\" EXTRA_LIBS=${EXTRA_LIBS}"
 
 EXTRA_LIBS_libc-uclibc = "-lintl"
 
-inherit update-alternatives
-ALTERNATIVE_NAME = "powertop"
-ALTERNATIVE_PATH = "${bindir}/powertop"
-ALTERNATIVE_LINK = "${base_bindir}/powertop"
-ALTERNATIVE_PRIORITY = "100"
-
 do_configure() {
 	# We do not build ncurses with wide char support
 	sed -i -e 's:lncursesw:lncurses ${EXTRA_LIBS}:g' ${S}/Makefile
@@ -40,3 +34,8 @@ 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"