From 6dc50b17360dfde34d01125a6f9747fcb530be1d Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Thu, 17 Feb 2011 10:48:12 +0800 Subject: toolchain-script/populate_sdk/meta-toolchain: moving common code. moving common code between populate_sdk.bbclass and meta-environment.bb into toolchain-script.bbclass. Signed-off-by: Lianhao Lu --- meta/recipes-core/meta/meta-environment.bb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb index 4ba919f7fe..0b8826032b 100644 --- a/meta/recipes-core/meta/meta-environment.bb +++ b/meta/recipes-core/meta/meta-environment.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK" LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" LICENSE = "MIT" -PR = "r1" +PR = "r2" EXCLUDE_FROM_WORLD = "1" @@ -22,22 +22,12 @@ do_generate_content() { rm -rf ${SDK_OUTPUT} mkdir -p ${SDK_OUTPUT}/${SDKPATH} - siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} - - touch $siteconfig - for sitefile in ${TARGET_CONFIG_SITE} ; do - cat $sitefile >> $siteconfig - done + toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE} toolchain_create_sdk_env_script_for_installer # Add version information - versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS} - touch $versionfile - echo 'Distro: ${DISTRO}' >> $versionfile - echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile - echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile - echo 'Timestamp: ${DATETIME}' >> $versionfile + toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS} } addtask generate_content before do_install after do_compile -- cgit v1.2.3