diff options
| author | Tim Orling <ticotimo@gmail.com> | 2026-06-12 13:11:50 -0700 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-06-13 03:35:33 +0000 |
| commit | 5ebb6ee6c1db9d77e029a13f84c75216acdbeee6 (patch) | |
| tree | a82b283afcfd96f67d707beb8605a404129839bc | |
| parent | d623a2e2593cb6ef8b637b754a4ecf0a6ff8cf4d (diff) | |
| download | meta-virtualization-5ebb6ee6c1db9d77e029a13f84c75216acdbeee6.tar.gz | |
vcontainer-tarball: unset OECORE_NATIVE_SYSROOT in CI
Add 'unset OECORE_NATIVE_SYSROOT' to the end of environment-setup-ci
for the same reasons it needed to be in environment-setup-none.
This fixes issues seen on AutoBuilder workers which use buildtools-tarball
and also usage of oe-run-native (e.g. for skopeo-native or cosign-native).
Signed-off-by: Tim Orling <tim.orling@konsulko.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
| -rw-r--r-- | recipes-containers/vcontainer/vcontainer-tarball.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-containers/vcontainer/vcontainer-tarball.bb b/recipes-containers/vcontainer/vcontainer-tarball.bb index 7e59c77d..f943cfd0 100644 --- a/recipes-containers/vcontainer/vcontainer-tarball.bb +++ b/recipes-containers/vcontainer/vcontainer-tarball.bb | |||
| @@ -451,6 +451,8 @@ ENVEOF | |||
| 451 | export VCONTAINER_DIR="${SDKPATH}" | 451 | export VCONTAINER_DIR="${SDKPATH}" |
| 452 | export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}" | 452 | export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}" |
| 453 | export PATH="${SDKPATH}:${SDKPATHNATIVE}/usr/bin:/usr/bin:/bin:\$PATH" | 453 | export PATH="${SDKPATH}:${SDKPATHNATIVE}/usr/bin:/usr/bin:/bin:\$PATH" |
| 454 | # Clean up - unset to avoid confusing other Yocto tools' >> $script | ||
| 455 | unset OECORE_NATIVE_SYSROOT | ||
| 454 | CISCRIPT | 456 | CISCRIPT |
| 455 | chmod 755 $ci_script | 457 | chmod 755 $ci_script |
| 456 | 458 | ||
