diff options
| -rw-r--r-- | meta/classes/populate_sdk.bbclass | 13 | ||||
| -rw-r--r-- | meta/classes/toolchain-scripts.bbclass | 24 | ||||
| -rw-r--r-- | meta/recipes-core/meta/meta-environment.bb | 16 |
3 files changed, 29 insertions, 24 deletions
diff --git a/meta/classes/populate_sdk.bbclass b/meta/classes/populate_sdk.bbclass index 7e260ef38d..474b43bb9e 100644 --- a/meta/classes/populate_sdk.bbclass +++ b/meta/classes/populate_sdk.bbclass @@ -38,21 +38,12 @@ fakeroot do_populate_sdk() { ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache # Setup site file for external use - siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} - touch $siteconfig - for sitefile in ${CONFIG_SITE} ; do - cat $sitefile >> $siteconfig - done + toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE} toolchain_create_sdk_env_script # Add version information - versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${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-${MULTIMACH_TARGET_SYS} # Package it up mkdir -p ${SDK_DEPLOY} diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass index fb59761fd6..2b9cfac6a1 100644 --- a/meta/classes/toolchain-scripts.bbclass +++ b/meta/classes/toolchain-scripts.bbclass @@ -88,3 +88,27 @@ toolchain_create_sdk_env_script_for_installer () { echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script } + +#This function create a site config file +toolchain_create_sdk_siteconfig () { + local siteconfig=$1 + shift + local files=$@ + + rm -f $siteconfig + touch $siteconfig + for sitefile in ${files} ; do + cat $sitefile >> $siteconfig + done +} + +#This function create a version information file +toolchain_create_sdk_version () { + local versionfile=$1 + rm -f $versionfile + touch $versionfile + echo 'Distro: ${DISTRO}' >> $versionfile + echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile + echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile + echo 'Timestamp: ${DATETIME}' >> $versionfile +} 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 |