Merge remote branch 'origin/org.openembedded.dev' into shr/testing2010

Conflicts:
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/openmoko-3rdparty/pisi_0.5.2.bb
	recipes/openmoko-3rdparty/pisi_0.5.3.bb
	recipes/openmoko-3rdparty/pisi_0.5.bb
	recipes/uclibc/uclibc_nptl.bb

3 files changed, 28 insertions, 13 deletions

diff --git a/recipes/meta/external-toolchain-csl.bb b/recipes/meta/external-toolchain-csl.bb
index aa2252efe8..7cbfe0ac19 100644
--- a/recipes/meta/external-toolchain-csl.bb
+++ b/recipes/meta/external-toolchain-csl.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "r5"
 
 INHIBIT_DEFAULT_DEPS = "1"
 
@@ -24,7 +24,6 @@ PROVIDES = "\
 	linux-libc-headers \
 "
 
-RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
 RPROVIDES_glibc-dev += "libc-dev"
 PACKAGES_DYNAMIC += "glibc-gconv-*"
 PACKAGES_DYNAMIC += "glibc-locale-*"
@@ -189,6 +188,12 @@ PKGV_localedef = ${CSL_VER_LIBC}
 PKGV_libsegfault = ${CSL_VER_LIBC}
 PKGV_linux-libc-headers = ${CSL_VER_KERNEL}
 
+LICENSE_ldd = "LGPLv2.1+"
+LICENSE_glibc = "LGPLv2.1+"
+LICENSE_glibc-thread-db = "LGPLv2.1+"
+LICENSE_libgcc := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2009q1-203"]}"
+LICENSE_libstdc++ := "${@["GPLv3 with GCC RLE", "GPLv2 with GCC RLE"][csl_get_main_version(d) <= "2009q1-203"]}"
+
 do_install() {
 	install -d ${D}${sysconfdir}
 	install -d ${D}${bindir}
diff --git a/recipes/meta/meta-toolchain-qte.bb b/recipes/meta/meta-toolchain-qte.bb
index 789b99a032..bb24db8b7f 100644
--- a/recipes/meta/meta-toolchain-qte.bb
+++ b/recipes/meta/meta-toolchain-qte.bb
@@ -1,11 +1,11 @@
 # Qt Embedded toolchain
-PR = "r2"
+PR = "r3"
 TOOLCHAIN_HOST_TASK = "task-qte-toolchain-host"
 TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target"
 
 require meta-toolchain.bb
 SDK_SUFFIX = "toolchain-qte"
-
+SDK_SUFFIX_angstrom = "toolchain-qte-${ANGSTROM_QT_VERSION}"
 
 QT_DIR_NAME = "qtopia"
 
diff --git a/recipes/meta/meta-toolchain.bb b/recipes/meta/meta-toolchain.bb
index bdafdbccaa..adc057a253 100644
--- a/recipes/meta/meta-toolchain.bb
+++ b/recipes/meta/meta-toolchain.bb
@@ -19,7 +19,9 @@ FEED_ARCH ?= "${TARGET_ARCH}"
 SDK_SUFFIX = "toolchain"
 TOOLCHAIN_OUTPUTNAME ?= "${DISTRO}-${DISTRO_VERSION}-${SDK_SYS}-${FEED_ARCH}-${TARGET_OS}-${SDK_SUFFIX}"
 
-RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
+DISTRO_FEED_CONFIGS ?= " "
+
+RDEPENDS = "${DISTRO_FEED_CONFIGS} ${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
 TOOLCHAIN_FEED_URI ?= "${DISTRO_FEED_URI}"
 
@@ -30,13 +32,21 @@ modify_opkg_conf () {
         rm -f ${OUTPUT_OPKGCONF_TARGET}
         rm -f ${OUTPUT_OPKGCONF_HOST}
         rm -f ${OUTPUT_OPKGCONF_SDK}
-        opkgarchs="${PACKAGE_ARCHS}"
-        priority=1
-        for arch in ${opkgarchs}; do
-                echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET};
-                echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET};
-                priority=$(expr ${priority} + 5);
-        done
+
+        if [ -e ${SDK_OUTPUT}/${SDKPATH}/${TARGET_SYS}/${sysconfdir}/opkg/arch.conf ] ; then
+            echo "Creating empty opkg.conf since arch.conf is already present"
+            echo > ${OUTPUT_OPKGCONF_TARGET} 
+        else
+            opkgarchs="${PACKAGE_ARCHS}"
+            priority=1
+            for arch in ${opkgarchs}; do
+                    echo "arch ${arch} ${priority}" >> ${OUTPUT_OPKGCONF_TARGET};
+                    if [ -n "${TOOLCHAIN_FEED_URI}" ] ; then
+                        echo "src/gz ${arch} ${TOOLCHAIN_FEED_URI}/${arch}" >> ${OUTPUT_OPKGCONF_TARGET};
+                    fi
+                    priority=$(expr ${priority} + 5);
+            done
+        fi
 }
 
 do_populate_sdk() {
@@ -55,7 +65,7 @@ do_populate_sdk() {
 	${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK}
 
 	${IPKG_TARGET} update
-	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
+	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK} ${DISTRO_FEED_CONFIGS}
 
 	# Remove packages in the exclude list which were installed by dependencies
 	if [ ! -z "${TOOLCHAIN_TARGET_EXCLUDE}" ]; then