summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2011-07-28 11:10:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-01 13:16:55 (GMT)
commite464fb9a2809aa88f56b5c44d318d3bb3dadd7fc (patch)
tree4c3ee29295d48a8f659c34bac603c026ea7fe46e
parent8685aa52d1a0b58a487e466c4d57dd663398e169 (diff)
downloadpoky-e464fb9a2809aa88f56b5c44d318d3bb3dadd7fc.tar.gz
meta-environment: set correct *MULTIMACH_TARGET_SYS.
Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available. Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead. (From OE-Core rev: b69a2be2f30dc633597399d42d6c87d9f0910c1a) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/toolchain-scripts.bbclass7
-rw-r--r--meta/recipes-core/meta/meta-environment.bb9
2 files changed, 9 insertions, 7 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 3301319..832cce4 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -66,13 +66,14 @@ toolchain_create_tree_env_script () {
66# This function creates an environment-setup-script for use by the ADT installer 66# This function creates an environment-setup-script for use by the ADT installer
67toolchain_create_sdk_env_script_for_installer () { 67toolchain_create_sdk_env_script_for_installer () {
68 # Create environment setup script 68 # Create environment setup script
69 script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${OLD_MULTIMACH_TARGET_SYS} 69 local multimach_target_sys=$1
70 script=${SDK_OUTPUT}/${SDKPATH}/environment-setup-${multimach_target_sys}
70 rm -f $script 71 rm -f $script
71 touch $script 72 touch $script
72 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/${OLD_MULTIMACH_TARGET_SYS}:$PATH' >> $script 73 echo 'export PATH=${SDKPATHNATIVE}${bindir_nativesdk}:${SDKPATHNATIVE}${bindir_nativesdk}/'"${multimach_target_sys}"':$PATH' >> $script
73 echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script 74 echo 'export PKG_CONFIG_SYSROOT_DIR=##SDKTARGETSYSROOT##' >> $script
74 echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script 75 echo 'export PKG_CONFIG_PATH=##SDKTARGETSYSROOT##${target_libdir}/pkgconfig' >> $script
75 echo 'export CONFIG_SITE=${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS}' >> $script 76 echo 'export CONFIG_SITE=${SDKPATH}/site-config-'"${multimach_target_sys}" >> $script
76 echo 'export CC=${TARGET_PREFIX}gcc' >> $script 77 echo 'export CC=${TARGET_PREFIX}gcc' >> $script
77 echo 'export CXX=${TARGET_PREFIX}g++' >> $script 78 echo 'export CXX=${TARGET_PREFIX}g++' >> $script
78 echo 'export GDB=${TARGET_PREFIX}gdb' >> $script 79 echo 'export GDB=${TARGET_PREFIX}gdb' >> $script
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 351cbf0..6d547bb 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,13 +2,14 @@ DESCRIPTION = "Package of environment files for SDK"
2LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 2LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r4" 5PR = "r5"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
9inherit toolchain-scripts 9inherit toolchain-scripts
10# get target config site before inheritting cross-canadian 10# get target config site before inheritting cross-canadian
11TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}" 11TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
12REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
12 13
13SDK_DIR = "${WORKDIR}/sdk" 14SDK_DIR = "${WORKDIR}/sdk"
14SDK_OUTPUT = "${SDK_DIR}/image" 15SDK_OUTPUT = "${SDK_DIR}/image"
@@ -22,12 +23,12 @@ do_generate_content() {
22 rm -rf ${SDK_OUTPUT} 23 rm -rf ${SDK_OUTPUT}
23 mkdir -p ${SDK_OUTPUT}/${SDKPATH} 24 mkdir -p ${SDK_OUTPUT}/${SDKPATH}
24 25
25 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE} 26 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
26 27
27 toolchain_create_sdk_env_script_for_installer 28 toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS}
28 29
29 # Add version information 30 # Add version information
30 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS} 31 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${REAL_MULTIMACH_TARGET_SYS}
31} 32}
32addtask generate_content before do_install after do_compile 33addtask generate_content before do_install after do_compile
33 34