diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2012-11-15 15:28:12 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:03 +0000 |
commit | 990a17c6758834aefcd5f828b8a67d15e9f88723 (patch) | |
tree | 111df638ce774aca783b55431bd5a2a451816df1 /meta/recipes-extended/tar | |
parent | dbadf6b9f5bae1e513b0f1957b8a4c9687d5ea80 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-extended/tar')
-rw-r--r-- | meta/recipes-extended/tar/tar.inc | 11 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar_1.17.bb | 2 | ||||
-rw-r--r-- | 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 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 | ||
9 | inherit autotools gettext | 9 | inherit autotools gettext |
10 | 10 | ||
11 | EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}" | ||
12 | |||
11 | EXTRAINSTALL = "do_install_extra" | 13 | EXTRAINSTALL = "do_install_extra" |
12 | 14 | ||
13 | do_install () { | 15 | do_install () { |
@@ -21,11 +23,16 @@ do_install_extra () { | |||
21 | rmdir ${D}${bindir}/ | 23 | rmdir ${D}${bindir}/ |
22 | } | 24 | } |
23 | 25 | ||
26 | PACKAGES =+ "${PN}-rmt" | ||
27 | |||
28 | FILES_${PN}-rmt = "${base_sbindir}/rmt*" | ||
29 | |||
24 | inherit update-alternatives | 30 | inherit update-alternatives |
25 | 31 | ||
26 | ALTERNATIVE_PRIORITY = "100" | 32 | ALTERNATIVE_PRIORITY = "100" |
27 | 33 | ||
28 | ALTERNATIVE_${PN} = "tar rmt" | 34 | ALTERNATIVE_${PN} = "tar" |
35 | ALTERNATIVE_${PN}-rmt = "rmt" | ||
29 | 36 | ||
30 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" | 37 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" |
31 | ALTERNATIVE_LINK_NAME[rmt] = "${libexecdir}/rmt" | 38 | 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 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 | |||
3 | LICENSE = "GPLv2" | 3 | LICENSE = "GPLv2" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" |
5 | 5 | ||
6 | PR = "r2" | 6 | PR = "r3" |
7 | 7 | ||
8 | SRC_URI += "file://m4extensions.patch \ | 8 | SRC_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 | |||
3 | LICENSE = "GPLv3" | 3 | LICENSE = "GPLv3" |
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
5 | 5 | ||
6 | PR = "r3" | 6 | PR = "r4" |
7 | 7 | ||
8 | SRC_URI += "file://remove-gets.patch \ | 8 | SRC_URI += "file://remove-gets.patch \ |
9 | " | 9 | " |