summaryrefslogtreecommitdiffstats
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:31:03 +0000
commit990a17c6758834aefcd5f828b8a67d15e9f88723 (patch)
tree111df638ce774aca783b55431bd5a2a451816df1
parentdbadf6b9f5bae1e513b0f1957b8a4c9687d5ea80 (diff)
downloadpoky-990a17c6758834aefcd5f828b8a67d15e9f88723.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. (From OE-Core rev: cc5879ce75713506e76481f36d6e45dc3b31948c) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 b50425e6a1..f49c7de4a5 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"
8 8
9inherit autotools gettext 9inherit autotools gettext
10 10
11EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
12
11EXTRAINSTALL = "do_install_extra" 13EXTRAINSTALL = "do_install_extra"
12 14
13do_install () { 15do_install () {
@@ -21,11 +23,16 @@ do_install_extra () {
21 rmdir ${D}${bindir}/ 23 rmdir ${D}${bindir}/
22} 24}
23 25
26PACKAGES =+ "${PN}-rmt"
27
28FILES_${PN}-rmt = "${base_sbindir}/rmt*"
29
24inherit update-alternatives 30inherit update-alternatives
25 31
26ALTERNATIVE_PRIORITY = "100" 32ALTERNATIVE_PRIORITY = "100"
27 33
28ALTERNATIVE_${PN} = "tar rmt" 34ALTERNATIVE_${PN} = "tar"
35ALTERNATIVE_${PN}-rmt = "rmt"
29 36
30ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" 37ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
31ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt" 38ALTERNATIVE_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 9425f14dda..b9ca2063df 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 = "r2" 6PR = "r3"
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 4c8ab2c4f5..03a35c3d3f 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 = "r3" 6PR = "r4"
7 7
8SRC_URI += "file://remove-gets.patch \ 8SRC_URI += "file://remove-gets.patch \
9 " 9 "