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:32:46 +0100
commit725acfad7c093708d3d7cd72f8e72fedce4335a4 (patch)
tree60dac2a41f53ca542d6c7c87218557b078f46ce7
parenta0da8e7e8feccfc01646eb8f4fcfc5a1c6552b2c (diff)
downloadast2050-yocto-poky-725acfad7c093708d3d7cd72f8e72fedce4335a4.zip
ast2050-yocto-poky-725acfad7c093708d3d7cd72f8e72fedce4335a4.tar.gz
Couple minor fixes for the OECORE rename
(From OE-Core rev: b5cfa911ed80a7e57ae1025b9e365f4678acf491) Signed-off-by: Jessica Zhang <jessica.zhang@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 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}"
OpenPOWER on IntegriCloud