From 445d6426197579a9c0317498cc6919bb63e7f726 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Tue, 16 Aug 2011 11:21:54 +0800 Subject: 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 --- meta/recipes-core/meta/meta-environment.bb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'meta/recipes-core/meta/meta-environment.bb') 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} -- cgit 1.2.3-korg