summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/toolchain-scripts.bbclass8
-rw-r--r--meta/recipes-core/meta/meta-environment.bb2
-rw-r--r--meta/recipes-core/meta/meta-toolchain.bb2
3 files changed, 4 insertions, 8 deletions
diff --git a/meta/classes/toolchain-scripts.bbclass b/meta/classes/toolchain-scripts.bbclass
index 711efd39ab..2099c4def8 100644
--- a/meta/classes/toolchain-scripts.bbclass
+++ b/meta/classes/toolchain-scripts.bbclass
@@ -105,7 +105,7 @@ toolchain_create_sdk_env_script_for_installer () {
105#we get the cached site config in the runtime 105#we get the cached site config in the runtime
106TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}" 106TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
107TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" 107TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
108TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses" 108TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses"
109 109
110#This function create a site config file 110#This function create a site config file
111toolchain_create_sdk_siteconfig () { 111toolchain_create_sdk_siteconfig () {
@@ -113,9 +113,7 @@ toolchain_create_sdk_siteconfig () {
113 113
114 rm -f $siteconfig 114 rm -f $siteconfig
115 touch $siteconfig 115 touch $siteconfig
116 if [ "${LIBC}" = "eglibc" ]; then 116
117 TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
118 fi
119 for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do 117 for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
120 cat $sitefile >> $siteconfig 118 cat $sitefile >> $siteconfig
121 done 119 done
@@ -146,7 +144,5 @@ python __anonymous () {
146 deps = "" 144 deps = ""
147 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): 145 for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
148 deps += " %s:do_populate_sysroot" % dep 146 deps += " %s:do_populate_sysroot" % dep
149 if d.getVar('TCLIBC', True) is "uclibc":
150 deps += "uclibc:do_populate_sysroot"
151 d.appendVarFlag('do_configure', 'depends', deps) 147 d.appendVarFlag('do_configure', 'depends', deps)
152} 148}
diff --git a/meta/recipes-core/meta/meta-environment.bb b/meta/recipes-core/meta/meta-environment.bb
index 8f9391a239..97313000f6 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://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 2LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 3 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
4LICENSE = "MIT" 4LICENSE = "MIT"
5PR = "r7" 5PR = "r8"
6 6
7EXCLUDE_FROM_WORLD = "1" 7EXCLUDE_FROM_WORLD = "1"
8 8
diff --git a/meta/recipes-core/meta/meta-toolchain.bb b/meta/recipes-core/meta/meta-toolchain.bb
index 1058c68efe..61f9d34f4b 100644
--- a/meta/recipes-core/meta/meta-toolchain.bb
+++ b/meta/recipes-core/meta/meta-toolchain.bb
@@ -1,7 +1,7 @@
1DESCRIPTION = "Meta package for building a installable toolchain" 1DESCRIPTION = "Meta package for building a installable toolchain"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4PR = "r6" 4PR = "r7"
5 5
6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 6LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 7 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"