summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Zhang <jessica.zhang@intel.com>2011-05-17 14:34:39 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-18 14:28:09 +0100
commitb5cfa911ed80a7e57ae1025b9e365f4678acf491 (patch)
tree55d6fcb3238de59a09d08e20121f196875ee0447
parent89ff546de3ce6b1c441f04d7a153c4f8d514a749 (diff)
downloadopenembedded-core-contrib-b5cfa911ed80a7e57ae1025b9e365f4678acf491.tar.gz
openembedded-core-contrib-b5cfa911ed80a7e57ae1025b9e365f4678acf491.tar.bz2
openembedded-core-contrib-b5cfa911ed80a7e57ae1025b9e365f4678acf491.zip
Couple minor fixes for the OECORE rename
Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
-rw-r--r--meta/classes/toolchain-scripts.bbclass6
-rw-r--r--meta/conf/bitbake.conf2
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}"