diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-22 23:23:10 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2020-09-30 04:35:15 -1000 |
| commit | d00bab16aefb3f200b01ad6baee15bc9cca7b6ce (patch) | |
| tree | 368799026b3ea324ad3513852c105b3855f86587 | |
| parent | b62ced32772d21c689998c5995f31550db51466d (diff) | |
| download | openembedded-core-contrib-d00bab16aefb3f200b01ad6baee15bc9cca7b6ce.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.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ea5128fde10eb9be7fefbbb87ae6181edd2bcdff)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 3 |
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 . \$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}/ |