summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/populate_sdk.bbclass13
-rw-r--r--meta/classes/toolchain-scripts.bbclass24
-rw-r--r--meta/recipes-core/meta/meta-environment.bb16
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() {
38 ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache 38 ln -s /etc/ld.so.cache ${SDK_OUTPUT}/${SDKPATHNATIVE}/etc/ld.so.cache
39 39
40 # Setup site file for external use 40 # Setup site file for external use
41 siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} 41 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${MULTIMACH_TARGET_SYS} ${CONFIG_SITE}
42 touch $siteconfig
43 for sitefile in ${CONFIG_SITE} ; do
44 cat $sitefile >> $siteconfig
45 done
46 42
47 toolchain_create_sdk_env_script 43 toolchain_create_sdk_env_script
48 44
49 # Add version information 45 # Add version information
50 versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${MULTIMACH_TARGET_SYS} 46 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${MULTIMACH_TARGET_SYS}
51 touch $versionfile
52 echo 'Distro: ${DISTRO}' >> $versionfile
53 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
54 echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
55 echo 'Timestamp: ${DATETIME}' >> $versionfile
56 47
57 # Package it up 48 # Package it up
58 mkdir -p ${SDK_DEPLOY} 49 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 () {
88 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script 88 echo 'export POKY_DISTRO_VERSION="${DISTRO_VERSION}"' >> $script
89 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script 89 echo 'export POKY_SDK_VERSION="${SDK_VERSION}"' >> $script
90} 90}
91
92#This function create a site config file
93toolchain_create_sdk_siteconfig () {
94 local siteconfig=$1
95 shift
96 local files=$@
97
98 rm -f $siteconfig
99 touch $siteconfig
100 for sitefile in ${files} ; do
101 cat $sitefile >> $siteconfig
102 done
103}
104
105#This function create a version information file
106toolchain_create_sdk_version () {
107 local versionfile=$1
108 rm -f $versionfile
109 touch $versionfile
110 echo 'Distro: ${DISTRO}' >> $versionfile
111 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
112 echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
113 echo 'Timestamp: ${DATETIME}' >> $versionfile
114}
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"
2LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 2LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
3 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3 file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r1" 5PR = "r2"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
@@ -22,22 +22,12 @@ do_generate_content() {
22 rm -rf ${SDK_OUTPUT} 22 rm -rf ${SDK_OUTPUT}
23 mkdir -p ${SDK_OUTPUT}/${SDKPATH} 23 mkdir -p ${SDK_OUTPUT}/${SDKPATH}
24 24
25 siteconfig=${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} 25 toolchain_create_sdk_siteconfig ${SDK_OUTPUT}/${SDKPATH}/site-config-${OLD_MULTIMACH_TARGET_SYS} ${TARGET_CONFIG_SITE}
26
27 touch $siteconfig
28 for sitefile in ${TARGET_CONFIG_SITE} ; do
29 cat $sitefile >> $siteconfig
30 done
31 26
32 toolchain_create_sdk_env_script_for_installer 27 toolchain_create_sdk_env_script_for_installer
33 28
34 # Add version information 29 # Add version information
35 versionfile=${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS} 30 toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${OLD_MULTIMACH_TARGET_SYS}
36 touch $versionfile
37 echo 'Distro: ${DISTRO}' >> $versionfile
38 echo 'Distro Version: ${DISTRO_VERSION}' >> $versionfile
39 echo 'Metadata Revision: ${METADATA_REVISION}' >> $versionfile
40 echo 'Timestamp: ${DATETIME}' >> $versionfile
41} 31}
42addtask generate_content before do_install after do_compile 32addtask generate_content before do_install after do_compile
43 33