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-10-06 14:15:21 +0100
commit9dfed6a194328f4fa6fc1072541e8ddaa755f82c (patch)
treedaa10404ba2cff80ab61bbbf401db39bcfb05f9a /meta/recipes-core
parentd092baeef2ab6777a96dd4163dec017216dd99a3 (diff)
downloadpoky-9dfed6a194328f4fa6fc1072541e8ddaa755f82c.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: d00bab16aefb3f200b01ad6baee15bc9cca7b6ce) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit ea5128fde10eb9be7fefbbb87ae6181edd2bcdff) Signed-off-by: Steve Sakoman <steve@sakoman.com> 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 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
79 . \$envfile 79 . \$envfile
80 done 80 done
81fi 81fi
82# We have to unset this else it can confuse oe-selftest and other tools
83# which may also use the overlapping namespace.
84unset OECORE_NATIVE_SYSROOT
82EOF 85EOF
83 86
84 mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/ 87 mkdir -p ${SDK_OUTPUT}/${SDKPATHNATIVE}${sysconfdir}/