merge of '5281adaea9fd65292934a8ed7fa0e871e220ca7f'

     and 'db972685a453721f344867c46d01ba28142c82bf'

103 files changed, 4351 insertions, 889 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9746a4a1a2..1842441ff5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -155,9 +155,10 @@ Recipes:    linux-handhelds-2.6, opie-*
 Person:     Philip Balister
 Mail:       Crofton@balister.org
 Website:    http://www.balister.org
-Machines:   omap5912osk
-Distros:    openomap
-Recipes:    xerces-c, omniorb
+Machines:   omap5912osk, gumstix-connex, gumstix-verdex, Efika, davinci-dvevm
+Interests:  Software Defined Radio, 
+Interests:  wireless networking (not necessarily wireless NIC's)
+Recipes:    omniorb, gnuradio
 
 Person:     Philippe De Swert
 Mail:       philippedeswert@scarlet.be
@@ -217,7 +218,7 @@ Recipes:    vsftpd, zd1211
 Person:     Henning Heinold 'woglinde'
 Mail:       heinold@inf.fu-berlin.de
 Machines:   simpad
-Recipes:    classpath-minimal, midpath, cacao-clcd
+Recipes:    classpath-minimal, midpath, cacao-cldc
 
 Person:     Philipp Zabel
 Mail:       philipp.zabel@gmail.com
diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass
index 45812bbb81..2ec7d305f2 100644
--- a/classes/rm_work.bbclass
+++ b/classes/rm_work.bbclass
@@ -14,7 +14,7 @@ do_rm_work () {
     for dir in *
     do
         if [ `basename ${S}` = $dir ]; then
-            rm -rf $dir/*
+            rm -rf $dir
         elif [ $dir != 'temp' ]; then
             rm -rf $dir
         fi
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d642998e8d..de5266f855 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -108,6 +108,8 @@ PROVIDES = ""
 PROVIDES_prepend = "${P} ${PF} ${PN} "
 RPROVIDES = ""
 
+MULTI_PROVIDER_WHITELIST = "virtual/libintl"
+
 PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale"
 FILES = ""
 
diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc
index dc3929c3a7..91afb658e3 100644
--- a/conf/distro/include/angstrom-eglibc.inc
+++ b/conf/distro/include/angstrom-eglibc.inc
@@ -2,6 +2,7 @@
 PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
 PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial"
 
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "eglibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "eglibc-intermediate"
diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc
index 1eabe6b868..1502833389 100644
--- a/conf/distro/include/angstrom-glibc.inc
+++ b/conf/distro/include/angstrom-glibc.inc
@@ -2,7 +2,7 @@
 PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
 PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
 PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial"
+PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial"
 
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
 
diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc
index 7c3c4a8f41..80c861b95c 100644
--- a/conf/distro/include/openmoko.inc
+++ b/conf/distro/include/openmoko.inc
@@ -119,7 +119,7 @@ PREFERRED_VERSION_dates = "0.1"
 # Development
 #
 PREFERRED_PROVIDER_qemu-native = "qemu-native"
-PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}"
+PREFERRED_VERSION_qemu-native = "0.9.0+cvs${SRCDATE}"
 
 #
 # Opie
diff --git a/conf/machine/include/tune-x86-nocona.conf b/conf/machine/include/tune-x86-nocona.conf
new file mode 100644
index 0000000000..f1189a171e
--- /dev/null
+++ b/conf/machine/include/tune-x86-nocona.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=nocona"
+TARGET_CC_KERNEL_ARCH = "-march=nocona"
diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf
index 0b26436bf5..73dced352e 100644
--- a/conf/machine/omap1710h3.conf
+++ b/conf/machine/omap1710h3.conf
@@ -1,12 +1,12 @@
 #@TYPE: Machine
-#@NAME: OMAP1610 cpu on an H2 board
-#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+#@NAME: OMAP1710 cpu on an H2 board
+#@DESCRIPTION: Machine configuration for the OMAP H3 development board with a 1710 processor
 
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "armv5te"
 
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
 PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf
index a9e1a00cc5..fb9f4669da 100644
--- a/conf/machine/omap2420h4.conf
+++ b/conf/machine/omap2420h4.conf
@@ -1,17 +1,16 @@
 #@TYPE: Machine
-#@NAME: OMAP1610 cpu on an H2 board
-#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+#@NAME: OMAP2420 cpu on an H4 board
+#@DESCRIPTION: Machine configuration for the OMAP H4 development board with a 2420 processor
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS = "armv5te armv6te"
-
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-
-BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap2"
+PREFERRED_VERSION_u-boot = "1.1.4"
 
 SERIAL_CONSOLE ?= "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 
-require conf/machine/include/tune-arm926ejs.conf
+MACHINE_FEATURES = "kernel26"
+
+require conf/machine/include/tune-arm1136jf-s.conf
diff --git a/conf/machine/x86-32-nocona.conf b/conf/machine/x86-32-nocona.conf
new file mode 100644
index 0000000000..ebb7a14b06
--- /dev/null
+++ b/conf/machine/x86-32-nocona.conf