diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-07 21:13:35 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-08 09:17:35 +0100 |
| commit | 513f4006bf563620ee063ba6d0e9b3f27334642e (patch) | |
| tree | e92e7da9bae9b08366c22866faf1faa57aaa2fd0 | |
| parent | d656936ec7fbd4c2748a8f2239b6c09e5b9216d9 (diff) | |
| download | openembedded-core-513f4006bf563620ee063ba6d0e9b3f27334642e.tar.gz | |
populate_sdk_ext: Ensure buildtools doesn't corrupt OECORE_NATIVE_SYSROOT
buildtools is built as a nativesdk which needs to use OECORE_NATIVE_SYSROOT
for its own purposes and can reset it. Save and restore the value
within the eSDK so the two don't clash.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index fd0da16e7e..44d99cfb97 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -653,7 +653,10 @@ sdk_ext_postinst() { # Make sure when the user sets up the environment, they also get # the buildtools-tarball tools in their path. + echo "# Save and reset OECORE_NATIVE_SYSROOT as buildtools may change it" >> $env_setup_script + echo "SAVED=\"\$OECORE_NATIVE_SYSROOT\"" >> $env_setup_script echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script + echo "OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script fi # Allow bitbake environment setup to be ran as part of this sdk. |