Patchwork [12/15] Couple minor fixes for the OECORE rename

login
register
mail settings
Submitter Saul Wold
Date May 18, 2011, 8:17 a.m.
Message ID <804a1414d232d46df6755cb576e026ef360b25c6.1305702436.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/4299/
State New, archived
Headers show

Comments

Saul Wold - May 18, 2011, 8:17 a.m.
From: Jessica Zhang <jessica.zhang@intel.com>

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
---
 meta/classes/toolchain-scripts.bbclass |    6 +++---
 meta/conf/bitbake.conf                 |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index aa34b98..09ecd7c 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 c292759..a0af672 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}"