summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-05-21 13:18:49 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-30 12:04:42 +0100
commit6d76d521a124b9b229b1a330cdaf977f434503be (patch)
tree743762fa051d5b5e566782548658d05f4bf0977d /meta
parent76c08cc0d2b36c343f4b37eec8a91f52533b3334 (diff)
downloadpoky-6d76d521a124b9b229b1a330cdaf977f434503be.tar.gz
tar: use new update-alternatives
(From OE-Core rev: ed48d4b382dae08ac47bccdcb98b1e87dc6449cc) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/tar/tar.inc18
-rw-r--r--meta/recipes-extended/tar/tar_1.17.bb2
-rw-r--r--meta/recipes-extended/tar/tar_1.26.bb2
3 files changed, 10 insertions, 12 deletions
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 () {
17 17
18do_install_extra () { 18do_install_extra () {
19 install -d ${D}${base_bindir} 19 install -d ${D}${base_bindir}
20 mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN} 20 mv ${D}${bindir}/tar ${D}${base_bindir}/tar
21 rmdir ${D}${bindir}/ 21 rmdir ${D}${bindir}/
22 rmdir ${D}${sbindir}/ 22 rmdir ${D}${sbindir}/
23 mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
24} 23}
25 24
26pkg_postinst_${PN} () { 25inherit update-alternatives
27 update-alternatives --install ${base_bindir}/tar tar tar.${PN} 100
28 update-alternatives --install ${libexecdir}/rmt rmt rmt.${PN} 100
29}
30 26
31pkg_prerm_${PN} () { 27ALTERNATIVE_PRIORITY = "100"
32 update-alternatives --remove tar tar.${PN} 28
33 update-alternatives --remove rmt rmt.${PN} 29ALTERNATIVE_${PN} = "tar rmt"
34} 30
31ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
32ALTERNATIVE_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
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 4LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI += "file://m4extensions.patch \ 8SRC_URI += "file://m4extensions.patch \
9 file://gcc43build.patch \ 9 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
3LICENSE = "GPLv3" 3LICENSE = "GPLv3"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5 5
6PR = "r1" 6PR = "r2"
7 7
8SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519" 8SRC_URI[md5sum] = "2cee42a2ff4f1cd4f9298eeeb2264519"
9SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41" 9SRC_URI[sha256sum] = "5a5369f464502a598e938029c310d4b3abd51e6bb8dfd045663e61c8ea9f6d41"