sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Lianhao Lu 2011-08-16 11:21:54 +08:00 committed by Richard Purdie
parent c6b808413d
commit 64c1f93828
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/populate_sdk.bbclass
View File

@ -47,7 +47,7 @@ fakeroot do_populate_sdk() {
ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache
# Setup site file for external use
toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE}
toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS}
toolchain_create_sdk_env_script

7
meta/recipes-core/meta/meta-environment.bb
View File

@ -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}

2
meta/recipes-core/meta/meta-toolchain-gmae.bb
View File

@ -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"

4
meta/recipes-core/meta/meta-toolchain.bb
View File

@ -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)}"