aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2012-11-15 15:28:12 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:30:31 +0000
commitcc5879ce75713506e76481f36d6e45dc3b31948c (patch)
tree286bc5c024d8057af5a8ba9922323b1f7e97c1a5 /meta/recipes-extended
parent487d58a98cd9fe4b368f0e7d119f8ff7ac852781 (diff)
downloadopenembedded-core-contrib-cc5879ce75713506e76481f36d6e45dc3b31948c.tar.gz
tar: Split RMT from tar
After the recent change of the libexecdir definition, the update-alternatives for the libexec rmt broke. Fix this by moving rmt from libexec to /sbin. Also split the rmt app from tar as it's likely not useful to many users. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended')
-rw-r--r--meta/recipes-extended/tar/tar.inc11
-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, 11 insertions, 4 deletions
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index b50425e6a10..f49c7de4a57 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -8,6 +8,8 @@ SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2"
inherit autotools gettext
+EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
+
EXTRAINSTALL = "do_install_extra"
do_install () {
@@ -21,11 +23,16 @@ do_install_extra () {
rmdir ${D}${bindir}/
}
+PACKAGES =+ "${PN}-rmt"
+
+FILES_${PN}-rmt = "${base_sbindir}/rmt*"
+
inherit update-alternatives
ALTERNATIVE_PRIORITY = "100"
-ALTERNATIVE_${PN} = "tar rmt"
+ALTERNATIVE_${PN} = "tar"
+ALTERNATIVE_${PN}-rmt = "rmt"
ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
-ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt"
+ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
diff --git a/meta/recipes-extended/tar/tar_1.17.bb b/meta/recipes-extended/tar/tar_1.17.bb
index 9425f14ddab..b9ca2063dfe 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 = "r2"
+PR = "r3"
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 4c8ab2c4f5a..03a35c3d3fa 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 = "r3"
+PR = "r4"
SRC_URI += "file://remove-gets.patch \
"