[oe-commits] Patrick Ohly : tar-replacement-native: relocate via NATIVE_PACKAGE_PATH_SUFFIX
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 19 17:07:17 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: e6fee3ddb5600fc564243a96d6232b4ae097df32
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e6fee3ddb5600fc564243a96d6232b4ae097df32
Author: Patrick Ohly <patrick.ohly at intel.com>
Date: Fri Aug 14 18:01:41 2015 +0200
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).
Signed-off-by: Patrick Ohly <patrick.ohly at intel.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>
---
meta/recipes-extended/tar/tar-replacement-native_1.28.bb | 6 ------
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 071ede7..0000000
--- a/meta/recipes-extended/tar/tar-replacement-native_1.28.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require tar_${PV}.bb
-
-inherit native
-
-BPN = "tar"
-EXTRAINSTALL = ""
diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
index 7416927..b339c43 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}"
# directory.
acpaths = "-I ./m4"
-EXTRAINSTALL = "do_install_extra"
-EXTRAINSTALL_class-nativesdk = ""
-
do_install () {
autotools_do_install
ln -s tar ${D}${bindir}/gtar
- ${EXTRAINSTALL}
}
-do_install_extra () {
+do_install_append_class-target() {
install -d ${D}${base_bindir}
mv ${D}${bindir}/tar ${D}${base_bindir}/tar
mv ${D}${bindir}/gtar ${D}${base_bindir}/gtar
@@ -48,4 +44,7 @@ ALTERNATIVE_${PN}-rmt_class-nativesdk = ""
ALTERNATIVE_LINK_NAME[tar] = "${base_bindir}/tar"
ALTERNATIVE_LINK_NAME[rmt] = "${base_sbindir}/rmt"
-BBCLASSEXTEND = "nativesdk"
+PROVIDES_append_class-native = " tar-replacement-native"
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native nativesdk"
More information about the Openembedded-commits
mailing list