From ed48d4b382dae08ac47bccdcb98b1e87dc6449cc Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@windriver.com>
Date: Mon, 21 May 2012 13:18:49 -0500
Subject: tar: use new update-alternatives

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
 meta/recipes-extended/tar/tar.inc     | 18 ++++++++----------
 meta/recipes-extended/tar/tar_1.17.bb |  2 +-
 meta/recipes-extended/tar/tar_1.26.bb |  2 +-
 3 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'meta')

diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 0533b82d27..8c475dfdea 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -17,18 +17,16 @@ do_install () {
 
 do_install_extra () {
     install -d ${D}${base_bindir}
-    mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
+    mv ${D}${bindir}/tar ${D}${base_bindir}/tar
     rmdir ${D}${bindir}/
     rmdir ${D}${sbindir}/
-    mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
 }
 
-pkg_postinst_${PN} () {
-    update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
-    update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
-}
+inherit update-alternatives
 
-pkg_prerm_${PN} () {
-    update-alternatives --remove tar tar.${PN}
-    update-alternatives --remove rmt rmt.${PN}
-}
+ALTERNATIVE_PRIORITY = "100"
+
+ALTERNATIVE_${PN} = "tar rmt"
+
+ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
+ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt"
diff --git a/meta/recipes-extended/tar/tar_1.17.bb b/meta/recipes-extended/tar/tar_1.17.bb
index 138ea7141e..9425f14dda 100644
--- a/meta/recipes-extended/tar/tar_1.17.bb
+++ b/meta/recipes-extended/tar/tar_1.17.bb
@@ -3,7 +3,7 @@ require tar.inc
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI += "file://m4extensions.patch \
     file://gcc43build.patch \
diff --git a/meta/recipes-extended/tar/tar_1.26.bb b/meta/recipes-extended/tar/tar_1.26.bb
index e679ccbf00..9c06d7e065 100644
--- a/meta/recipes-extended/tar/tar_1.26.bb
+++ b/meta/recipes-extended/tar/tar_1.26.bb
@@ -3,7 +3,7 @@ require tar.inc
 LICENSE = "GPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"
 SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"
-- 
cgit v1.2.3