diff options
| author |   Lianhao Lu <lianhao.lu@intel.com> | 2011-08-16 11:21:54 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-24 19:26:01 -0700 |
| commit | 445d6426197579a9c0317498cc6919bb63e7f726 (patch) | |
| tree | f06efb892e8ff96192caa3331744078b17b68ec1 /meta/recipes-core/meta | |
| parent | 9e87f1347788beed181476dc4563085db14a4729 (diff) | |
| download | openembedded-core-contrib-445d6426197579a9c0317498cc6919bb63e7f726.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.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'meta/recipes-core/meta')
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 7 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-toolchain-gmae.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-toolchain.bb | 4 |
3 files changed, 6 insertions, 7 deletions
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" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LICENSE = "MIT" -PR = "r6" +PR = "r7" EXCLUDE_FROM_WORLD = "1" inherit toolchain-scripts -# get target config site before inheritting cross-canadian -TARGET_CONFIG_SITE := "${@siteinfo_get_files(d)}" +TOOLCHAIN_NEED_CONFIGSITE_CACHE += "zlib" REAL_MULTIMACH_TARGET_SYS = "${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}" SDK_DIR = "${WORKDIR}/sdk" @@ -23,7 +22,7 @@ do_generate_content() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT}/${SDKPATH} - toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE} + toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${REAL_MULTIMACH_TARGET_SYS} toolchain_create_sdk_env_script_for_installer ${REAL_MULTIMACH_TARGET_SYS} 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}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" PROVIDES = "meta-toolchain-sdk" require meta-toolchain.bb + +TOOLCHAIN_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 @@ DESCRIPTION = "Meta package for building a installable toolchain" LICENSE = "MIT" -PR = "r5" +PR = "r6" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" IMAGETEST ?= "dummy" inherit populate_sdk imagetest-${IMAGETEST} - -CONFIG_SITE := "${@siteinfo_get_files(d)}" |