Skip to contentSkip to conversation

Populate libc's siteconfig file into metatoolchain

PATCH Applied Lianhao Lu 2 participants 3 messages Mar 23, 2012 – Apr 3, 2012

lore
Share & tools
lore

Lianhao Lu

author
#0 lore raw

cover Populate libc's siteconfig file into metatoolchain

This fixed the Yocto bug #2159

The following changes since commit b92aaf764e6de94fb9fdee610e8f6643ccf74894:
Richard Purdie (1):
gst-plugins-bluetooth: Don't install headers, man pages or .pc files

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/siteconfig
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/siteconfig

Lianhao Lu (1):
meta-toolchain: Popluated the libc siteconfig files.

 meta/classes/toolchain-scripts.bbclass     |    8 ++------
 meta/recipes-core/meta/meta-environment.bb |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)
author
#1 lore raw

PATCH 1/1 meta-toolchain: Popluated the libc siteconfig files.

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

Signed-off-by Lianhao Lu <[email protected]>
---
 meta/classes/toolchain-scripts.bbclass     |    8 ++------
 meta/recipes-core/meta/meta-environment.bb |    2 +-
 meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)
meta/classes/toolchain-scripts.bbclass +2 -6
index 711efd3..2099c4d 100644
@@ -105,7 +105,7 @@ toolchain_create_sdk_env_script_for_installer () {
 #we get the cached site config in the runtime
 TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
 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
 toolchain_create_sdk_siteconfig () {

@@ -113,9 +113,7 @@ toolchain_create_sdk_siteconfig () {
 
 	rm -f $siteconfig
 	touch $siteconfig
-	if [ "${LIBC}" = "eglibc" ]; then
-		TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
-	fi
+
 	for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
 		cat $sitefile >> $siteconfig
 	done

@@ -146,7 +144,5 @@ python __anonymous () {
     deps = ""
     for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
         deps += " %s:do_populate_sysroot" % dep
-    if d.getVar('TCLIBC', True) is "uclibc":
-	deps += "uclibc:do_populate_sysroot"
     d.appendVarFlag('do_configure', 'depends', deps)
 }
meta/recipes-core/meta/meta-environment.bb +1 -1
index 8f9391a..9731300 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Package of environment files for SDK"
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 LICENSE = "MIT"
-PR = "r7"
+PR = "r8"
 
 EXCLUDE_FROM_WORLD = "1"
meta/recipes-core/meta/meta-toolchain.bb +1 -1
index 1058c68..61f9d34 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 
-PR = "r6"
+PR = "r7"
 
 LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
Signature · 1 line
1.7.0.4
Applied
#2 lore raw
In reply to Lianhao Lu
Quoted 20 lines · Lianhao Lu

This fixed the Yocto bug #2159

The following changes since commit b92aaf764e6de94fb9fdee610e8f6643ccf74894:
Richard Purdie (1):
gst-plugins-bluetooth: Don't install headers, man pages or .pc files

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib llu/siteconfig
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=llu/siteconfig

Lianhao Lu (1):
meta-toolchain: Popluated the libc siteconfig files.

  meta/classes/toolchain-scripts.bbclass     |    8 ++------
  meta/recipes-core/meta/meta-environment.bb |    2 +-
  meta/recipes-core/meta/meta-toolchain.bb   |    2 +-
  3 files changed, 4 insertions(+), 8 deletions(-)
Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!