diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-07-28 19:10:16 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-01 14:16:55 +0100 |
commit | e464fb9a2809aa88f56b5c44d318d3bb3dadd7fc (patch) | |
tree | 4c3ee29295d48a8f659c34bac603c026ea7fe46e /meta/recipes-core/meta/meta-environment.bb | |
parent | 8685aa52d1a0b58a487e466c4d57dd663398e169 (diff) | |
download | poky-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>
Diffstat (limited to 'meta/recipes-core/meta/meta-environment.bb')
-rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 351cbf0cfd..6d547bba20 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" | |||
2 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ | 2 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ |
3 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 3 | file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | PR = "r4" | 5 | PR = "r5" |
6 | 6 | ||
7 | EXCLUDE_FROM_WORLD = "1" | 7 | EXCLUDE_FROM_WORLD = "1" |
8 | 8 | ||
9 | inherit toolchain-scripts | 9 | inherit toolchain-scripts |
10 | # get target config site before inheritting cross-canadian | 10 | # get target config site before inheritting cross-canadian |
11 | TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}" | 11 | TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}" |
12 | REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" | ||
12 | 13 | ||
13 | SDK_DIR = "${WORKDIR}/sdk" | 14 | SDK_DIR = "${WORKDIR}/sdk" |
14 | SDK_OUTPUT = "${SDK_DIR}/image" | 15 | SDK_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 | } |
32 | addtask generate_content before do_install after do_compile | 33 | addtask generate_content before do_install after do_compile |
33 | 34 | ||