[oe-commits] Mark Hatle : tar: Split RMT from tar
git at git.openembedded.org
git at git.openembedded.org
Thu Dec 6 12:34:29 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: cc5879ce75713506e76481f36d6e45dc3b31948c
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cc5879ce75713506e76481f36d6e45dc3b31948c
Author: Mark Hatle <mark.hatle at windriver.com>
Date: Thu Nov 15 15:28:12 2012 -0600
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 at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-extended/tar/tar.inc | 11 +++++++++--
meta/recipes-extended/tar/tar_1.17.bb | 2 +-
meta/recipes-extended/tar/tar_1.26.bb | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index b50425e..f49c7de 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 9425f14..b9ca206 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 4c8ab2c..03a35c3 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 \
"
More information about the Openembedded-commits
mailing list