summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-07 21:13:35 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-08-08 09:17:49 +0100
commit4901fc6d2754bb1e8f2e0ea845116e475e85d4a6 (patch)
treebfa93d3e80d26fd0f5a79b984a2353e6c231e030
parentdb05c02af4dfcbfa789b0d5a4fae00766f7104db (diff)
downloadpoky-4901fc6d2754bb1e8f2e0ea845116e475e85d4a6.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. (From OE-Core rev: 513f4006bf563620ee063ba6d0e9b3f27334642e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass3
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() {
653 653
654 # Make sure when the user sets up the environment, they also get 654 # Make sure when the user sets up the environment, they also get
655 # the buildtools-tarball tools in their path. 655 # the buildtools-tarball tools in their path.
656 echo "# Save and reset OECORE_NATIVE_SYSROOT as buildtools may change it" >> $env_setup_script
657 echo "SAVED=\"\$OECORE_NATIVE_SYSROOT\"" >> $env_setup_script
656 echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script 658 echo ". $target_sdk_dir/buildtools/environment-setup*" >> $env_setup_script
659 echo "OECORE_NATIVE_SYSROOT=\"\$SAVED\"" >> $env_setup_script
657 fi 660 fi
658 661
659 # Allow bitbake environment setup to be ran as part of this sdk. 662 # Allow bitbake environment setup to be ran as part of this sdk.