From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 7 Aug 2020 20:13:35 +0000 (+0100)
Subject: populate_sdk_ext: Ensure buildtools doesn't corrupt OECORE_NATIVE_SYSROOT
X-Git-Tag: uninative-2.9~82
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=513f4006bf563620ee063ba6d0e9b3f27334642e;p=openembedded-core.git

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

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.