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>
This commit is contained in:
Richard Purdie
2020-08-07 21:13:35 +01:00
parent db05c02af4
commit 4901fc6d27

View File

@@ -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.