]> code.ossystems Code Review - openembedded-core.git/commitdiff
buildtools-tarball: Fix conflicts with oe-selftest and other tooling
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 22 Sep 2020 22:23:10 +0000 (23:23 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 23 Sep 2020 19:53:10 +0000 (20:53 +0100)
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>
meta/recipes-core/meta/buildtools-tarball.bb

index ef56f76fa7190b129a4bd80b0fc8db17a10a39f9..560b8d67b9bbbed506826bf50153828f8e374f59 100644 (file)
@@ -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