summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/tar
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2015-08-14 18:01:41 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-19 18:05:33 +0100
commit3753b51a173e308df2e1ddc30d56cdced45ebf69 (patch)
treec481fd9e5f374bfc408cd042a822859c1aacddda /meta/recipes-extended/tar
parenta56d7e90eef4f1a16378dd9c9f47dfa70a9502d1 (diff)
downloadpoky-3753b51a173e308df2e1ddc30d56cdced45ebf69.tar.gz
tar-replacement-native: relocate via NATIVE_PACKAGE_PATH_SUFFIX
Building tar-replacement-native as replacement of the host's tar in the standard path was meant to be done manually by a user in preparation for the regular bitbake run. Such a usage has been superseeded by installing the pre-compiled buildutils and might have been broken on hosts which need it by the sanity check for tar >= 1.26. Therefore tar-replacement-native_1.28.bb can be removed in favor of adapting the normal tar recipe such that it installs an opt-in binary under a different path. The special do_install logic is explicitly limited to class-target, instead of making it the default and disabling it (which would be the case for class-native and class-nativesdk). (From OE-Core rev: e6fee3ddb5600fc564243a96d6232b4ae097df32) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@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-replacement-native_1.28.bb6
-rw-r--r--meta/recipes-extended/tar/tar.inc11
2 files changed, 5 insertions, 12 deletions
diff --git a/meta/recipes-extended/tar/tar-replacement-native_1.28.bb b/meta/recipes-extended/tar/tar-replacement-native_1.28.bb
deleted file mode 100644
index 071ede765b..0000000000
--- a/meta/recipes-extended/tar/tar-replacement-native_1.28.bb
+++ /dev/null
@@ -1,6 +0,0 @@
1require tar_${PV}.bb
2
3inherit native
4
5BPN = "tar"
6EXTRAINSTALL = ""
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 74169274f4..b339c43385 100644
--- a/meta/recipes-extended/tar/tar.inc
+++ b/meta/recipes-extended/tar/tar.inc
@@ -16,16 +16,12 @@ EXTRA_OECONF += "DEFAULT_RMT_DIR=${base_sbindir}"
16# directory. 16# directory.
17acpaths = "-I ./m4" 17acpaths = "-I ./m4"
18 18
19EXTRAINSTALL = "do_install_extra"
20EXTRAINSTALL_class-nativesdk = ""
21
22do_install () { 19do_install () {
23 autotools_do_install 20 autotools_do_install
24 ln -s tar ${D}${bindir}/gtar 21 ln -s tar ${D}${bindir}/gtar
25 ${EXTRAINSTALL}
26} 22}
27 23
28do_install_extra () { 24do_install_append_class-target() {
29 install -d ${D}${base_bindir} 25 install -d ${D}${base_bindir}
30 mv ${D}${bindir}/tar ${D}${base_bindir}/tar 26 mv ${D}${bindir}/tar ${D}${base_bindir}/tar
31 mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar 27 mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
@@ -48,4 +44,7 @@ ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
48ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" 44ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
49ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" 45ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
50 46
51BBCLASSEXTEND = "nativesdk" 47PROVIDES_append_class-native = " tar-replacement-native"
48NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
49
50BBCLASSEXTEND = "native nativesdk"