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 fd0da16e7ea2b73051b70800380fbd34598d5d1c..44d99cfb972f801c6f7f1842fdffa36ac3b6808f 100644 (file)
--- 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.