From: Richard Purdie Date: Tue, 22 Sep 2020 22:23:10 +0000 (+0100) Subject: buildtools-tarball: Fix conflicts with oe-selftest and other tooling X-Git-Tag: 2020-10-gatesgarth~172 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ea5128fde10eb9be7fefbbb87ae6181edd2bcdff;p=openembedded-core.git 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 --- 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 . \$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