1 files changed, 11 insertions, 4 deletions

diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 7a91c6b6ac..387db75373 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -48,8 +48,15 @@ inherit meta
 inherit populate_sdk
 
 create_sdk_files_append () {
-        rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config*
-        
-        cat ${SDK_OUTPUT}/${SDKPATH}/environment-setup* | grep " PATH=\|OECORE_NATIVE_SYSROOT" > ${WORKDIR}/envtmp
-        mv ${WORKDIR}/envtmp ${SDK_OUTPUT}/${SDKPATH}/environment-setup*
+        rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
+        rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*
+        rm -f ${SDK_OUTPUT}/${SDKPATH}/version-*
+
+        # Generate new (mini) sdk-environment-setup file
+        script=${1:-${SDK_OUTPUT}/${SDKPATH}/environment-setup-${SDK_SYS}}
+        touch $script
+        echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:$PATH' >> $script
+        echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
+
+        toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS}
 }