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 <[email protected]>
---
 meta/classes/populate_sdk_ext.bbclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/classes/populate_sdk_ext.bbclass 
b/meta/classes/populate_sdk_ext.bbclass
index fd0da16e7ea..44d99cfb972 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.
-- 
2.25.1

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.

View/Reply Online (#141304): 
https://lists.openembedded.org/g/openembedded-core/message/141304
Mute This Topic: https://lists.openembedded.org/mt/76057400/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub  
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to