diff options
author | Patrick Ohly <patrick.ohly@intel.com> | 2015-08-14 18:01:41 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-19 18:05:33 +0100 |
commit | 3753b51a173e308df2e1ddc30d56cdced45ebf69 (patch) | |
tree | c481fd9e5f374bfc408cd042a822859c1aacddda /meta | |
parent | a56d7e90eef4f1a16378dd9c9f47dfa70a9502d1 (diff) | |
download | poky-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')
-rw-r--r-- | meta/recipes-extended/tar/tar-replacement-native_1.28.bb | 6 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar.inc | 11 |
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 @@ | |||
1 | require tar_${PV}.bb | ||
2 | |||
3 | inherit native | ||
4 | |||
5 | BPN = "tar" | ||
6 | EXTRAINSTALL = "" | ||
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. |
17 | acpaths = "-I ./m4" | 17 | acpaths = "-I ./m4" |
18 | 18 | ||
19 | EXTRAINSTALL = "do_install_extra" | ||
20 | EXTRAINSTALL_class-nativesdk = "" | ||
21 | |||
22 | do_install () { | 19 | do_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 | ||
28 | do_install_extra () { | 24 | do_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 = "" | |||
48 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" | 44 | ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar" |
49 | ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" | 45 | ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt" |
50 | 46 | ||
51 | BBCLASSEXTEND = "nativesdk" | 47 | PROVIDES_append_class-native = " tar-replacement-native" |
48 | NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" | ||
49 | |||
50 | BBCLASSEXTEND = "native nativesdk" | ||