aboutsummaryrefslogtreecommitdiffstats
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:53:10 +0100
commitea5128fde10eb9be7fefbbb87ae6181edd2bcdff (patch)
tree7c01beb98ac185c6e4aa56437a19113da221dea2
parent630ce8130598e2bca7231ac28a7cc18b5b942544 (diff)
downloadopenembedded-core-contrib-ea5128fde10eb9be7fefbbb87ae6181edd2bcdff.tar.gz
openembedded-core-contrib-ea5128fde10eb9be7fefbbb87ae6181edd2bcdff.tar.bz2
openembedded-core-contrib-ea5128fde10eb9be7fefbbb87ae6181edd2bcdff.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 ef56f76fa71..560b8d67b9b 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
. \$envfile
done
fi
+# We have to unset this else it can confuse oe-selftest and other tools
+# which may also use the overlapping namespace.
+unset OECORE_NATIVE_SYSROOT
EOF
if [ "${SDKMACHINE}" = "i686" ]; then