summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-22 23:23:10 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-23 20:54:03 +0100
commit50075fe214f6ef2f66bfd3213bc3824672c69f97 (patch)
tree391d0384a36ddf0f4ae1c283fafb209a228d7915 /meta/recipes-core
parentbb759f56f6f4f63750bdeb2ddf75b9a080764221 (diff)
downloadpoky-50075fe214f6ef2f66bfd3213bc3824672c69f97.tar.gz
buildtools-tarball: Fix conflicts with oe-selftest and other tooling
OECORE_NATIVE_SYSROOT is used by tools like oe-run-native and hence we were seeing selftest failures when newer buildtools-tarballs that use this were run on the autobuilder. Unset the variable after use to avoid these issues. (From OE-Core rev: ea5128fde10eb9be7fefbbb87ae6181edd2bcdff) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index ef56f76fa7..560b8d67b9 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -80,6 +80,9 @@ if [ -d "\$OECORE_NATIVE_SYSROOT/environment-setup.d" ]; then
80 . \$envfile 80 . \$envfile
81 done 81 done
82fi 82fi
83# We have to unset this else it can confuse oe-selftest and other tools
84# which may also use the overlapping namespace.
85unset OECORE_NATIVE_SYSROOT
83EOF 86EOF
84 87
85 if [ "${SDKMACHINE}" = "i686" ]; then 88 if [ "${SDKMACHINE}" = "i686" ]; then