Patchwork [CONSOLIDATED,REQUEST,29/64] procps: cleanup update-alternatives deprecated code

login
register
mail settings
Submitter Saul Wold
Date Aug. 14, 2012, 12:13 p.m.
Message ID <929a33fc6f791a470cf6c19147c2ccb6d7a2f32f.1344946189.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/34525/
State Accepted
Commit 04c412803b7faf7ac87621be2c03b1f17a1f6c8c
Headers show

Comments

Saul Wold - Aug. 14, 2012, 12:13 p.m.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/recipes-extended/procps/procps.inc      |    9 +++++++--
 meta/recipes-extended/procps/procps_3.2.8.bb |    9 +--------
 2 files changed, 8 insertions(+), 10 deletions(-)

Patch

diff --git a/meta/recipes-extended/procps/procps.inc b/meta/recipes-extended/procps/procps.inc
index 80080fc..6ee4a04 100644
--- a/meta/recipes-extended/procps/procps.inc
+++ b/meta/recipes-extended/procps/procps.inc
@@ -13,8 +13,13 @@  DEPENDS = "ncurses"
 SRC_URI = "http://procps.sourceforge.net/procps-${PV}.tar.gz \
            file://install.patch"
 
-inherit autotools
+inherit autotools update-alternatives
 
 FILES_${PN} += "${libdir}/*-${PV}.so ${base_libdir}/*-${PV}.so"
 FILES_SOLIBSDEV = ""
-FILES_${PN} += ""
+
+ALTERNATIVE_${PN} = "top uptime free pkill pmap kill sysctl ps pgrep pwdx watch"
+ALTERNATIVE_LINK_NAME[kill] = "${base_bindir}/kill"
+ALTERNATIVE_LINK_NAME[sysctl] = "${base_sbindir}/sysctl"
+ALTERNATIVE_LINK_NAME[ps] = "${base_bindir}/ps"
+ALTERNATIVE_PRIORITY = "110"
diff --git a/meta/recipes-extended/procps/procps_3.2.8.bb b/meta/recipes-extended/procps/procps_3.2.8.bb
index 5508eb0..7b011a0 100644
--- a/meta/recipes-extended/procps/procps_3.2.8.bb
+++ b/meta/recipes-extended/procps/procps_3.2.8.bb
@@ -1,13 +1,6 @@ 
 require procps.inc
 
-PR = "r8"
-
-inherit update-alternatives
-
-ALTERNATIVE_LINKS = "${bindir}/top ${bindir}/uptime ${bindir}/free ${bindir}/pkill ${bindir}/pmap \
-                     ${base_bindir}/kill ${base_sbindir}/sysctl ${base_bindir}/ps \
-                     ${bindir}/pgrep ${bindir}/pwdx ${bindir}/watch"
-ALTERNATIVE_PRIORITY = "110"
+PR = "r9"
 
 SRC_URI += "file://procmodule.patch \
             file://psmodule.patch \