summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorLianhao Lu <lianhao.lu@intel.com>2011-08-16 11:21:54 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-24 19:26:08 -0700
commit64c1f93828402ffb5c0fada527724598bc300973 (patch)
tree26903c0bddd7eea27e816d21ca7d2cf6377a29f2 /meta
parentc6b808413d5ff1dbfdc4d615917345503029a282 (diff)
downloadpoky-64c1f93828402ffb5c0fada527724598bc300973.tar.gz
meta-toolchain/environment: Collected site config files in runtime.
[YOCTO #892] Use the new cached site config files generation mechanism in toolchain-script.bbclass. (From OE-Core rev: 445d6426197579a9c0317498cc6919bb63e7f726) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk.bbclass2
-rw-r--r--meta/recipes-core/meta/meta-environment.bb7
-rw-r--r--meta/recipes-core/meta/meta-toolchain-gmae.bb2
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb4
4 files changed, 7 insertions, 8 deletions
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass
index 0f3591b9d5..69780e5b21 100644
--- a/meta/classes/populate_sdk.bbclass
+++ b/meta/classes/populate_sdk.bbclass
@@ -47,7 +47,7 @@ fakeroot do_populate_sdk() {
47 ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache 47 ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache
48 48
49 # Setup site file for external use 49 # Setup site file for external use
50 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE} 50 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS}
51 51
52 toolchain_create_sdk_env_script 52 toolchain_create_sdk_env_script
53 53
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 114727cf3c..39ba96c9fb 100644
--- a/meta/recipes-core/meta/meta-environment.bb
+++ b/meta/recipes-core/meta/meta-environment.bb
@@ -2,13 +2,12 @@ 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 = "r6" 5PR = "r7"
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 10TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
11TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}"
12REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" 11REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
13 12
14SDK_DIR = "${WORKDIR}/sdk" 13SDK_DIR = "${WORKDIR}/sdk"
@@ -23,7 +22,7 @@ do_generate_content() {
23 rm -rf ${SDK_OUTPUT} 22 rm -rf ${SDK_OUTPUT}
24 mkdir -p ${SDK_OUTPUT}/${SDKPATH} 23 mkdir -p ${SDK_OUTPUT}/${SDKPATH}
25 24
26 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE} 25 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS}
27 26
28 toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS} 27 toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS}
29 28
diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb
index 4f5501e0a5..512810b365 100644
--- a/meta/recipes-core/meta/meta-toolchain-gmae.bb
+++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb
@@ -3,3 +3,5 @@ TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" 3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
4PROVIDES = "meta-toolchain-sdk" 4PROVIDES = "meta-toolchain-sdk"
5require meta-toolchain.bb 5require meta-toolchain.bb
6
7TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib"
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 164d7177f5..1058c68efe 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,12 +1,10 @@
1DESCRIPTION = "Meta package for building a installable toolchain" 1DESCRIPTION = "Meta package for building a installable toolchain"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4PR = "r5" 4PR = "r6"
5 5
6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
8 8
9IMAGETEST ?= "dummy" 9IMAGETEST ?= "dummy"
10inherit populate_sdk imagetest-${IMAGETEST} 10inherit populate_sdk imagetest-${IMAGETEST}
11
12CONFIG_SITE := "${@siteinfo_get_files(d)}"