From 9dfed6a194328f4fa6fc1072541e8ddaa755f82c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 22 Sep 2020 23:23:10 +0100 Subject: 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: d00bab16aefb3f200b01ad6baee15bc9cca7b6ce) Signed-off-by: Richard Purdie (cherry picked from commit ea5128fde10eb9be7fefbbb87ae6181edd2bcdff) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-core/meta/buildtools-tarball.bb | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta/recipes-core/meta') diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index 44d658687d..434ffdc334 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -79,6 +79,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 mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ -- cgit v1.2.3-54-g00ecf