merge of 'b9087aed5992eb3d85c7c859b89c4236a3d7e178'

     and 'de0f7d33bace1070e3a1202edc6e122f22d6873c'

7 files changed, 36 insertions, 74 deletions

diff --git a/packages/angstrom/angstrom-x11-gpe-image.bb b/packages/angstrom/angstrom-x11-gpe-image.bb
index 59ef3b95ba..ffd401b6a8 100644
--- a/packages/angstrom/angstrom-x11-gpe-image.bb
+++ b/packages/angstrom/angstrom-x11-gpe-image.bb
@@ -1,11 +1,5 @@
 #Angstrom X11 image, with apps and kernel modules included
 
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
-
 ANGSTROM_EXTRA_INSTALL += " \
                            ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
diff --git a/packages/angstrom/angstrom-x11-image.bb b/packages/angstrom/angstrom-x11-image.bb
index 4446c52a8d..e430590a7f 100644
--- a/packages/angstrom/angstrom-x11-image.bb
+++ b/packages/angstrom/angstrom-x11-image.bb
@@ -1,11 +1,5 @@
 #Angstrom X11 image
 
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
-
 ANGSTROM_EXTRA_INSTALL += " \
                            ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
diff --git a/packages/angstrom/angstrom-x11-office-image.bb b/packages/angstrom/angstrom-x11-office-image.bb
index e2c6167604..f9dcb8cf43 100644
--- a/packages/angstrom/angstrom-x11-office-image.bb
+++ b/packages/angstrom/angstrom-x11-office-image.bb
@@ -1,11 +1,5 @@
 #Angstrom X11 image, with apps and kernel modules included
 
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
-
 ANGSTROM_EXTRA_INSTALL += " \
                            ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
diff --git a/packages/angstrom/angstrom-x11-pimlico-image.bb b/packages/angstrom/angstrom-x11-pimlico-image.bb
index 1b40227347..c7acedfa0d 100644
--- a/packages/angstrom/angstrom-x11-pimlico-image.bb
+++ b/packages/angstrom/angstrom-x11-pimlico-image.bb
@@ -1,11 +1,5 @@
 #Angstrom X11 image, with apps and kernel modules included
 
-PREFERRED_PROVIDER_libgpewidget 	?= "libgpewidget"
-PREFERRED_PROVIDER_tslib 		?= "tslib"
-PREFERRED_PROVIDER_virtual/libsdl 	?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libxine 	?= "libxine-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "diet-x11"
-
 ANGSTROM_EXTRA_INSTALL += " \
                            ${@base_contains("MACHINE_FEATURES", "phone", "openmoko-dialer2", "",d)} \
 			  " 
diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb
index 3ee3932c1e..f6e0c33659 100644
--- a/packages/images/e-image-core.bb
+++ b/packages/images/e-image-core.bb
@@ -4,13 +4,6 @@ DEPENDS = "${MACHINE_TASK_PROVIDER} \
            xserver-kdrive \
            task-e-x11-core"
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/evas = "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
-PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
-PREFERRED_PROVIDER_libx11 = "libx11"
-
 IMAGE_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 IMAGE_LINGUAS = ""
 
diff --git a/packages/meta/meta-toolchain.bb b/packages/meta/meta-toolchain.bb
index 415b3ca3ec..a734005819 100644
--- a/packages/meta/meta-toolchain.bb
+++ b/packages/meta/meta-toolchain.bb
@@ -2,67 +2,36 @@ DESCRIPTION = "Meta package for building a installable toolchain"
 LICENSE = "MIT"
 DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native sed-native"
 
-inherit rootfs_ipk sdk meta
-
-PACKAGES = ""
-
-do_build[recrdeptask] = "do_build"
+inherit sdk meta
 
 SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
 
-IPKG_HOST = "ipkg-cl -f ${SDK_DIR}/ipkg-host.conf -o ${SDK_OUTPUT}"
-IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
+IPKG_HOST = "ipkg-cl -f ${IPKGCONF_SDK} -o ${SDK_OUTPUT}"
+IPKG_TARGET = "ipkg-cl -f ${IPKGCONF_TARGET} -o ${SDK_OUTPUT}/${prefix}"
 
-HOST_INSTALL = "\
-    binutils-cross-sdk \
-    gcc-cross-sdk \
-    gdb-cross"
-TARGET_INSTALL = "\
-    task-sdk-bare \
-    "
+TOOLCHAIN_HOST_TASK ?= "task-sdk-host"
+TOOLCHAIN_TARGET_TASK ?= "task-sdk-bare"
 
-RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
-
-sdk_ipk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
-}
+RDEPENDS = "${TOOLCHAIN_TARGET_TASK} ${TOOLCHAIN_HOST_TASK}"
 
 do_populate_sdk() {
-	sdk_ipk_do_indexes
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
-	cat <<EOF >${SDK_DIR}/ipkg-host.conf
-src oe file:${DEPLOY_DIR_IPK}/${BUILD_ARCH}
-arch ${BUILD_ARCH} 1
-EOF
-	cat <<EOF >${SDK_DIR}/ipkg-target.conf
-src oe file:${DEPLOY_DIR_IPK}
-EOF
-	ipkgarchs="${PACKAGE_ARCHS}"
-	priority=1
-	for arch in $ipkgarchs; do
-		echo "arch $arch $priority" >> ${SDK_DIR}/ipkg-target.conf
-		echo "arch ${BUILD_ARCH}-$arch-sdk $priority" >> ${SDK_DIR}/ipkg-host.conf
-		priority=$(expr $priority + 5)
+	package_update_index_ipk
+	package_generate_ipkg_conf
+
+	for arch in ${PACKAGE_ARCHS}; do
 		revipkgarchs="$arch $revipkgarchs"
-		if [ -e ${DEPLOY_DIR_IPK}/$arch/Packages ] ; then
-			echo "src oe-$arch file:${DEPLOY_DIR_IPK}/$arch" >> ${SDK_DIR}/ipkg-target.conf
-		fi
 	done
 
-	rm -r ${SDK_OUTPUT}
-	mkdir -p ${SDK_OUTPUT}
-
 	${IPKG_HOST} update
-	${IPKG_HOST} -force-depends install ${HOST_INSTALL}
+	${IPKG_HOST} -force-depends install ${TOOLCHAIN_HOST_TASK}
 
 	${IPKG_TARGET} update
-	${IPKG_TARGET} install ${TARGET_INSTALL}
+	${IPKG_TARGET} install ${TOOLCHAIN_TARGET_TASK}
 
 	mkdir -p ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
 	cp -pPR ${SDK_OUTPUT}/${prefix}/usr/* ${SDK_OUTPUT}/${prefix}/${TARGET_SYS}
diff --git a/packages/tasks/task-sdk-host.bb b/packages/tasks/task-sdk-host.bb
new file mode 100644
index 0000000000..d238b46144
--- /dev/null
+++ b/packages/tasks/task-sdk-host.bb
@@ -0,0 +1,24 @@
+#
+# Copyright (C) 2007 OpenedHand Ltd
+#
+
+DESCRIPTION = "Host packages for the standalone SDK or external toolchain"
+PR = "r1"
+LICENSE = "MIT"
+ALLOW_EMPTY = "1"
+
+inherit sdk
+
+PACKAGES = "${PN}"
+
+RDEPENDS_${PN} = "\
+    binutils-cross-sdk \
+    gcc-cross-sdk \
+    gdb-cross-sdk \
+    g++ \
+    cpp \
+    libgcc \
+    libgcc-dev \
+    libstdc++ \
+    libstdc++-dev \
+    "