mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 14:09:47 +00:00
Code Issues Projects Releases Wiki Activity

meta-toolchain: Popluated the libc siteconfig files.

Browse Source 
Fixed bug [YOCTO #2159] by correctly populate the libc's siteconfig
files.

(From OE-Core rev: eeee4b8c097e60070e4654a223b41fea0c96a12b)

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
2012-03-23 16:33:05 +08:00
committed by Richard Purdie
parent 5256a6b6c3
commit 8447aa2fae
3 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/toolchain-scripts.bbclass
+2 -6
View File
@@ -105,7 +105,7 @@ toolchain_create_sdk_env_script_for_installer () {
#we get the cached site config in the runtime #we get the cached site config in the runtime
TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}" TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d" TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses" TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TCLIBC} ncurses"
#This function create a site config file #This function create a site config file
toolchain_create_sdk_siteconfig () { toolchain_create_sdk_siteconfig () {
@@ -113,9 +113,7 @@ toolchain_create_sdk_siteconfig () {
rm -f $siteconfig rm -f $siteconfig
touch $siteconfig touch $siteconfig
if [ "${LIBC}" = "eglibc" ]; then
TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
fi
for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
cat $sitefile >> $siteconfig cat $sitefile >> $siteconfig
done done
@@ -146,7 +144,5 @@ python __anonymous () {
deps = "" deps = ""
for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split(): for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
deps += " %s:do_populate_sysroot" % dep deps += " %s:do_populate_sysroot" % dep
if d.getVar('TCLIBC', True) is "uclibc":
deps += "uclibc:do_populate_sysroot"
d.appendVarFlag('do_configure', 'depends', deps) d.appendVarFlag('do_configure', 'depends', deps)
} }
meta/recipes-core/meta/meta-environment.bb
+1 -1
View File
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
LICENSE = "MIT" LICENSE = "MIT"
PR = "r7" PR = "r8"
EXCLUDE_FROM_WORLD = "1" EXCLUDE_FROM_WORLD = "1"
meta/recipes-core/meta/meta-toolchain.bb
+1 -1
View File
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta package for building a installable toolchain" DESCRIPTION = "Meta package for building a installable toolchain"
LICENSE = "MIT" LICENSE = "MIT"
PR = "r6" PR = "r7"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"