psmisc: use new update-alternatives

(From OE-Core rev: 867864451baa875f48d87f4b8dbce80a90038243)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 7 insertions, 21 deletions

diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 4e9aad862d..76af99e8a8 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -23,10 +23,10 @@ PACKAGES += "psmisc-extras"
 FILES_${PN} = ""
 RDEPENDS_${PN} = "fuser killall pstree"
 
-FILES_fuser = "${bindir}/fuser.${PN}"
+FILES_fuser = "${bindir}/fuser.${BPN}"
 FILES_fuser-doc = "${mandir}/man1/fuser*"
 
-FILES_killall = "${bindir}/killall.${PN}"
+FILES_killall = "${bindir}/killall.${BPN}"
 FILES_killall-doc = "${mandir}/man1/killall*"
 
 FILES_pstree = "${bindir}/pstree"
@@ -35,24 +35,10 @@ FILES_pstree-doc = "${mandir}/man1/pstree*"
 FILES_psmisc-extras = "${bindir}"
 FILES_psmisc-extras-doc = "${mandir}"
 
-do_install_append() {
-        mv ${D}${bindir}/killall ${D}${bindir}/killall.${PN}
-        mv ${D}${bindir}/fuser ${D}${bindir}/fuser.${PN}
-}
+inherit update-alternatives
 
-pkg_postinst_killall() {
-        update-alternatives --install ${bindir}/killall killall killall.${PN} 90
-}
+ALTERNATIVE_PRIORITY = "90"
 
-pkg_postrm_killall() {
-        update-alternatives --remove ${bindir}/killall killall.${PN}
-}
-
-pkg_postinst_fuser() {
-        update-alternatives --install ${bindir}/fuser fuser fuser.${PN} 90
-}
-
-pkg_postrm_fuser() {
-    update-alternatives --remove ${bindir}/fuser fuser.${PN}
-}
+ALTERNATIVE_killall = "killall"
 
+ALTERNATIVE_fuser = "fuser"
diff --git a/meta/recipes-extended/psmisc/psmisc_22.16.bb b/meta/recipes-extended/psmisc/psmisc_22.16.bb
index ada46d9742..8ff3eee2a0 100644
--- a/meta/recipes-extended/psmisc/psmisc_22.16.bb
+++ b/meta/recipes-extended/psmisc/psmisc_22.16.bb
@@ -1,7 +1,7 @@
 require psmisc.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "d52caf26159c905574c2ce4bd792b9ee"
 SRC_URI[sha256sum] = "ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01"