2 files changed, 4 insertions, 4 deletions

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index aa34b98b51..09ecd7ca47 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -27,7 +27,7 @@ toolchain_create_sdk_env_script () {
         echo 'export LDFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
         echo 'export CPPFLAGS="--sysroot=${SDKTARGETSYSROOT}"' >> $script
         echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-        echo 'export POKY_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
+        echo 'export OECORE_TARGET_SYSROOT="${SDKTARGETSYSROOT}"' >> $script
         echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
 }
 
@@ -58,7 +58,7 @@ toolchain_create_tree_env_script () {
         echo 'export CFLAGS="${TARGET_CC_ARCH}"' >> $script
         echo 'export CXXFLAGS="${TARGET_CC_ARCH}"' >> $script
         echo 'export OECORE_NATIVE_SYSROOT="${STAGING_DIR_NATIVE}"' >> $script
-        echo 'export POKY_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
+        echo 'export OECORE_TARGET_SYSROOT="${STAGING_DIR_TARGET}"' >> $script
 }
 
 # This function creates an environment-setup-script for use by the ADT installer
@@ -88,7 +88,7 @@ toolchain_create_sdk_env_script_for_installer () {
         echo 'export LDFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
         echo 'export CPPFLAGS="--sysroot=##SDKTARGETSYSROOT##"' >> $script
         echo 'export OECORE_NATIVE_SYSROOT="${SDKPATHNATIVE}"' >> $script
-        echo 'export POKY_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
+        echo 'export OECORE_TARGET_SYSROOT="##SDKTARGETSYSROOT##"' >> $script
         echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
         echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
 }
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index c2927594b2..a0af672ae2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -327,7 +327,7 @@ DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 PKGDATA_DIR = "${TMPDIR}/pkgdata/${MULTIMACH_TARGET_SYS}"
 
-SDK_NAME = "${DISTRO}-${SDK_ARCH}-${TARGET_ARCH}"
+SDK_NAME = "oecore-${SDK_ARCH}-${TARGET_ARCH}"
 SDKPATH = "/usr/local/${SDK_NAME}"
 SDKPATHNATIVE = "${SDKPATH}/sysroots/${SDK_SYS}"