Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into org.openembedded.dev

30 files changed, 238 insertions, 89 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b06153b0ee..e42c704bd5 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -2742,6 +2742,10 @@ sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465
 md5=c1106f56f8e5562cf7c49d3455d2c5f7
 sha256=2bfc5db7703cbcaaa4be2576609136450e1dac5d4782707dd0dc81754e3c2489
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.39.tar.gz]
+md5=ba06291b737077332e914d6d653501c6
+sha256=924dc4b8ae78da2c8f3af9c36ab85d08ee7f8ec0ae4dfe58840ae70041580063
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -8882,6 +8886,10 @@ sha256=980320814b23cc51303436afb110397b15b950896f7f229484005f81d5cb6346
 md5=41b1ef201e4583e55a7462f1404de70d
 sha256=f8eb8f0c3af15acd5ad8c17fcc6d1ed2a43c35877d68a403eeb5bc1a1f0b3ccf
 
+[http://gpe.linuxtogo.org/download/source/gpe-mixer-0.50.tar.bz2]
+md5=67765a32def3ee408e84b9814b4e9759
+sha256=e7a13c0fd3eb0768034008778cb724aed8fbdf63d460d4df7212c3d2c14325b9
+
 [http://gpe.linuxtogo.org/download/source/gpe-nmf-0.17.tar.gz]
 md5=3fd22f7d95f9e1f328d768dedf7313a5
 sha256=6c11e7af568bf13602dec79cba5aacea590a2ec585f96dc96f87fa8950ffc31d
@@ -18374,6 +18382,14 @@ sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
 md5=26f67d99666834cc579094619821d3c8
 sha256=035bbd4c1ac9c5b3a42e58777446e0370ca66d9258dc30a9f4c5ad48ebfacd65
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc1.bz2]
+md5=05daeda25430fd13bbdb47b3481f7320
+sha256=5ed217591fefb043f4deb7b66a9b6351195dfb9405c0d2f5ec0f4d43a30aa9b2
+
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc3.bz2]
+md5=cd69d16ea42bbf20d0a505690be45868
+sha256=7d07783e7ba793c8e043a83a2aabcf23ef29174a1963643a407f3a02fcb4542b
+
 [http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.30-rc5.bz2]
 md5=2f399a5e286a9fe7cb40bfd3d42a7a3d
 sha256=79a9913a74e58af6431bb952aac2cf0a1f4422287f420844f24ca6bc5ed0fdc4
@@ -26802,6 +26818,10 @@ sha256=723dbbdfac6e421aa3343a2f1cef7cfb998bb5c045dcf0df870aeba6dd78b79d
 md5=658badd22689cdde536050f740ec8319
 sha256=70a767f1109bf70353c58b0fb54626a1300fd0724017196bfd17d13a582ddd62
 
+[http://gpe.linuxtogo.org/download/source/xserver-common-1.24.tar.gz]
+md5=6d7aaa9c267427ddb78faf008cf78187
+sha256=8109646b77c08a0f269531ad42475782101a88681c2590453f4a5c9fe4681932
+
 [http://gpe.linuxtogo.org/download/source/xserver-common-1.3.tar.gz]
 md5=b55e9347b9aed725cc7baf91701cdd83
 sha256=177b5a3e65d7a64b5a0fbbf1b10f8e3d020a20c823b1bb9f3269dc835df213e1
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index a466834968..bb50220f29 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -17,8 +17,8 @@
 
 #DISTRO_VERSION = "2009.X"
 DISTRO_VERSION = "2009.X-test-${DATE}"
-DISTRO_REVISION = "1"
-DISTRO_PR = ".1"
+DISTRO_REVISION = "2"
+DISTRO_PR = ".2"
 
 #build staging from packages
 INHERIT += "packaged-staging"
@@ -46,7 +46,7 @@ IMAGE_LINGUAS = '${@base_less_or_equal("ROOT_FLASH_SIZE", "16", "", "en-us", d)}
 
 
 # set feed path variables
-FEED_BASEPATH = "feeds/2008/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
+FEED_BASEPATH = "feeds/unstable/${ANGSTROM_PKG_FORMAT}/${LIBC}/"
 
 
 #The angstrom-mirrors.bbclass should have everything, but we can use this as a fallback
@@ -99,9 +99,6 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 # Blackfin has its on gcc
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
-ANGSTROM_GCC_VERSION_486sx      = "4.3.3"
-ANGSTROM_GCC_VERSION_armv7a     = "4.3.3" 
-
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
 #KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
 
@@ -109,10 +106,10 @@ ANGSTROM_GCC_VERSION_armv7a     = "4.3.3"
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
 #Everybody else can just use this: 
-ANGSTROM_GCC_VERSION                     ?= "4.2.4"
+ANGSTROM_GCC_VERSION                     ?= "4.3.3"
 
-#2.19.51.0.3
-ANGSTROM_BINUTILS_VERSION                ?= "2.18.50.0.7"
+ANGSTROM_BINUTILS_VERSION                ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv7a         ?= "2.18.50.0.7"
 
 PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
 PREFERRED_VERSION_binutils-cross         ?= "${ANGSTROM_BINUTILS_VERSION}"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index d8c3cd78df..7e921bf06a 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -32,9 +32,6 @@ require conf/distro/include/angstrom-${LIBC}.inc
 
 # We can't do ARM_INSTRUCTION_SET_armv4t since that will un-overridable in recipes like gcc
 ANGSTROM_ARM_INSTRUCTION_SET ?= "arm"
-ANGSTROM_ARM_INSTRUCTION_SET_armv4t = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5te = "thumb"
-ANGSTROM_ARM_INSTRUCTION_SET_armv5teb = "thumb"
 
 
 ARM_INSTRUCTION_SET = "${ANGSTROM_ARM_INSTRUCTION_SET}"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 49326f4806..bd78008dd0 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -253,7 +253,7 @@ SRCREV_pn-webkit-gtk ?= "43434"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
-SRCREV_pn-xf86-video-glamo ?= "16a993d8b17ef623a21b003f6f08adb86c76de77"
+SRCREV_pn-xf86-video-glamo ?= "25c4b0e80e93e04e6f7d4b8bca6d007fb9de6da8"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
diff --git a/conf/machine/micro2440.conf b/conf/machine/micro2440.conf
index 20e14af78f..f46d4f5822 100644
--- a/conf/machine/micro2440.conf
+++ b/conf/machine/micro2440.conf
@@ -7,7 +7,13 @@ TARGET_ARCH = "arm"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.29"
 
-# used by sysvinit_2
+# This is not necessarily true, there is a 800x480 display as well
+MACHINE_DISPLAY_WIDTH_PIXELS = "240"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
+MACHINE_DISPLAY_ORIENTATION = "0"
+MACHINE_DISPLAY_PPI = "110"
+
+# used by sysvinit
 SERIAL_CONSOLE = "115200 ttySAC0"
 
 IMAGE_FSTYPES = "jffs2 tar.gz"
@@ -17,4 +23,8 @@ MACHINE_FEATURES = "kernel26 touchscreen screen usbhost usbgadget sound alsa eth
 require conf/machine/include/tune-arm920t.inc
 
 KERNEL_IMAGETYPE = "uImage"
-EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian -e16KiB -n \
+        ; sumtool -e16KiB --no-cleanmarkers \
+        --littleendian --pad \
+        -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+        -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index c31828aafe..94ca2946e6 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -7,7 +7,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -15,7 +15,10 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER = "xserver-xorg \
+           xf86-input-tslib \
+           xf86-video-glamo \
+           xf86-input-keyboard"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/topas910.conf b/conf/machine/topas910.conf
index e4b9aead8a..c36dc3bc83 100644
--- a/conf/machine/topas910.conf
+++ b/conf/machine/topas910.conf
@@ -26,13 +26,13 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 SERIAL_CONSOLE = "115200 ttyS0"
 
 # used by some images
-ROOT_FLASH_SIZE = "256"
+ROOT_FLASH_SIZE = "16"
 
 # extra jffs2 tweaks
 IMAGE_FSTYPES ?= "jffs2"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 \
-	--pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
-	--littleendian --pad \
+	--pad 0x1aa0000 ; sumtool --eraseblock=0x20000 \
+	--littleendian --pad 0x1aa0000 \
 	-i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary"
 
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index f3f8c544c3..e9026f77f8 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -61,7 +61,13 @@ do_build
 # * ppc603e:   efika
 # * i586:      qemux86
 
-for machine in simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86
+if [ "$1" = "" ] ; then
+	ARCH_MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86"
+else
+	ARCH_MACHINES="$@"
+fi
+
+for machine in ${ARCH_MACHINES}
 do
         BUILD_MACHINE=$machine
         BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
@@ -356,8 +362,13 @@ done
 
 # machine packages (machine specific (sub)packages)
 
-for machine in overo omap3-pandora beagleboard omap3evm neuros-osd2 efika dht-walnut palmt650 omap5912osk ixp4xxle ixp4xxbe c7x0 poodle tosa akita spitz collie simpad om-gta01 om-gta02 a780 at91sam9263ek qemuarm h2200 h3900 h4000 hx4700 nokia800 dns323 mv2120 kuropro lspro tsx09 ts409 qemux86  
+if [ "$1" = "" ] ; then
+    MACHINES="simpad om-gta01 c7x0 ixp4xxbe nokia800 htckaiser beagleboard dht-walnut efika qemux86"
+else
+    MACHINES="$@"
+fi
 
+for machine in ${MACHINES}
 do
         BUILD_MACHINE=$machine
             BUILD_CLEAN="opkg-native qmake-native qmake2-native qt-x11-free python python-native python-pygtk gnome-icon-theme"
diff --git a/contrib/angstrom/upload-packages.sh b/contrib/angstrom/upload-packages.sh
index 37d8c9ac9b..609f16a938 100644
--- a/contrib/angstrom/upload-packages.sh
+++ b/contrib/angstrom/upload-packages.sh
@@ -8,7 +8,7 @@
 REMOTEM=angstrom@linuxtogo.org
 
 # Feed dir we want to upload to
-REMOTED=website/feeds/2008/ipk/$(basename $PWD)
+REMOTED=website/feeds/unstable/ipk/$(basename $PWD)
 
 # create upload dir
 mkdir -p upload-queue || true
diff --git a/recipes/bluez/bluez4_4.39.bb b/recipes/bluez/bluez4_4.39.bb
new file mode 100644
index 0000000000..c28f260761
--- /dev/null
+++ b/recipes/bluez/bluez4_4.39.bb
@@ -0,0 +1,64 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland V4"
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib"
+HOMEPAGE = "http://www.bluez.org"
+LICENSE = "GPL"
+
+# For angstrom we want this to replace at least bluez-libs
+PROVIDES_append_angstrom = " bluez-utils bluez-libs"
+
+SRC_URI = "\
+  http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \
+  file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \
+  file://sbc-thumb.patch;patch=1 \
+  file://bluetooth.conf \
+"
+S = "${WORKDIR}/bluez-${PV}"
+
+inherit autotools_stage
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+EXTRA_OECONF = "\
+  --enable-gstreamer \
+  --enable-alsa \
+  --enable-usb \
+  --enable-netlink \
+  --enable-tools \
+  --enable-bccmd \
+  --enable-hid2hci \
+  --enable-dfutool \
+  --enable-hidd \
+  --enable-pandd \
+  --enable-dund \
+  --disable-cups \
+  --enable-test \
+  --enable-manpages \
+  --enable-configfiles \
+  --enable-initscripts \
+  --disable-pcmciarules \
+"
+
+do_install_append() {
+        install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/
+        install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/
+        install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/
+        # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT
+        install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/
+}
+
+PACKAGES =+ "gst-plugin-bluez libasound-module-bluez"
+
+FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so"
+FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so"
+FILES_${PN} += "${libdir}/bluetooth/plugins/*.so"
+FILES_${PN}-dev += "\
+  ${libdir}/bluetooth/plugins/*.la \
+  ${libdir}/alsa-lib/*.la \
+  ${libdir}/gstreamer-0.10/*.la \
+"
+
+FILES_${PN}-dbg += "\
+  ${libdir}/bluetooth/plugins/.debug \
+  ${libdir}/*/.debug \
+"
diff --git a/recipes/cacao/cacao-native_0.99.4.bb b/recipes/cacao/cacao-native_0.99.4.bb
index 1b996ffbcc..1e09e3ddec 100644
--- a/recipes/cacao/cacao-native_0.99.4.bb
+++ b/recipes/cacao/cacao-native_0.99.4.bb
@@ -1,4 +1,5 @@
-# Do not use this on amd64 hosts yet!
+# 0.99.4 appears to be broken on amd64 and i386 :(
+DEFAULT_PREFERENCE = "-1"
 
 require cacao-native.inc
 
diff --git a/recipes/cacao/files/cacao-disable-stackbase-check.patch b/recipes/cacao/files/cacao-disable-stackbase-check.patch
new file mode 100644
index 0000000000..8eb20894d4
--- /dev/null
+++ b/recipes/cacao/files/cacao-disable-stackbase-check.patch
@@ -0,0 +1,12 @@
+Index: cacao-0.99.3+hg20090109/src/mm/boehm-gc/os_dep.c
+===================================================================
+--- cacao-0.99.3+hg20090109.orig/src/mm/boehm-gc/os_dep.c	2009-02-15 16:29:15.000000000 +0100
++++ cacao-0.99.3+hg20090109/src/mm/boehm-gc/os_dep.c	2009-02-15 16:29:24.000000000 +0100
+@@ -1077,7 +1077,6 @@
+       c = stat_buf[buf_offset++];
+     }
+     close(f);
+-    if (result < 0x10000000) ABORT("Absurd stack bottom value");
+     return (ptr_t)result;
+   }
+ 
diff --git a/recipes/gcc/gcc-4.3.3.inc b/recipes/gcc/gcc-4.3.3.inc
index 45cf3a231f..3e6c0979ce 100644
--- a/recipes/gcc/gcc-4.3.3.inc
+++ b/recipes/gcc/gcc-4.3.3.inc
@@ -7,6 +7,8 @@ LICENSE = "GPLv3"
 
 DEPENDS = "mpfr gmp"
 
+INC_PR = "r3"
+
 SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://fedora/gcc43-c++-builtin-redecl.patch;patch=1;pnum=0 \
 	file://fedora/gcc43-ia64-libunwind.patch;patch=1;pnum=0 \
@@ -65,6 +67,7 @@ SRC_URI_append_sh4  = " file://sh_unwind.patch;patch=1 \
 		      "
 # Language Overrides
 FORTRAN = ""
+FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
 EXTRA_OECONF_BASE = "  --enable-cheaders=c_std --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
diff --git a/recipes/gcc/gcc-cross-sdk_4.3.3.bb b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
index 7e3a459ea8..27a7ae0a7f 100644
--- a/recipes/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/recipes/gcc/gcc-cross-sdk_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r3"
+PR = "${INC_PR}.1"
 
 inherit sdk
 
diff --git a/recipes/gcc/gcc-cross_4.3.3.bb b/recipes/gcc/gcc-cross_4.3.3.bb
index 87b3ba5381..5eb6b5fbe8 100644
--- a/recipes/gcc/gcc-cross_4.3.3.bb
+++ b/recipes/gcc/gcc-cross_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-cross4.inc
 require gcc-configure-cross.inc
diff --git a/recipes/gcc/gcc_4.3.3.bb b/recipes/gcc/gcc_4.3.3.bb
index 83ebff7c80..9d58858faf 100644
--- a/recipes/gcc/gcc_4.3.3.bb
+++ b/recipes/gcc/gcc_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r1"
+PR = "${INC_PR}.1"
 require gcc-${PV}.inc
 require gcc-configure-target.inc
 require gcc-package-target.inc
diff --git a/recipes/glib-2.0/glib.inc b/recipes/glib-2.0/glib.inc
index b328cfad4d..e035d20d69 100644
--- a/recipes/glib-2.0/glib.inc
+++ b/recipes/glib-2.0/glib.inc
@@ -22,9 +22,12 @@ FILES_gobject-2.0 = "${libdir}/libgobject-2.0.so.*"
 FILES_gio-2.0 = "${libdir}/libgio-2.0.so.*"
 FILES_gthread-2.0 = "${libdir}/libgthread-2.0.so.*"
 
-# Let the gthread library end up in glib package
-# for compatibility.
+# Let various glib components end up in glib package
+# for compatibility (with binary packages from Maemo).
 FILES_gthread-2.0_chinook-compat = ""
+FILES_gmodule-2.0_chinook-compat = ""
+FILES_gobject-2.0_chinook-compat = ""
+FILES_gio-2.0_chinook-compat = ""
 
 EXTRA_OECONF = "--disable-debug "
 
diff --git a/recipes/images/gpe-image.bb b/recipes/images/gpe-image.bb
index 8cbe8a8571..768cc6bcae 100644
--- a/recipes/images/gpe-image.bb
+++ b/recipes/images/gpe-image.bb
@@ -1,10 +1,21 @@
+LICENSE = "MIT"
+
+# Set some defaults
+
+MACHINE_TASK_PROVIDER = "task-base-extended"
+GUI_MACHINE_CLASS ?= "none"
+XSERVER ?= "xserver-kdrive-fbdev"
 GPE_EXTRA_THEMES = "gpe-theme-industrial"
 
+# Select bootsplash 
+SPLASH ?= ' ${@base_contains("MACHINE_FEATURES", "screen", "psplash-angstrom", "",d)}'
+
+# Select some useful things depending on the device capabilities
+
 GPE_EXTRA_INSTALL_none = ""
 GPE_EXTRA_INSTALL_bigscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
 GPE_EXTRA_INSTALL_smallscreen = "task-gpe-games ${GPE_EXTRA_THEMES}"
 
-GUI_MACHINE_CLASS ?= "none"
 GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 #ship more stuff with devices with >16MB of flash
@@ -16,10 +27,10 @@ GPE_BIGFLASH_INSTALL := '${@base_conditional("ROOT_FLASH_SIZE", "16", "", "\
 
 GPE_EXTRA_INSTALL += "${GPE_BIGFLASH_INSTALL}"
 
-XSERVER ?= "xserver-kdrive-fbdev"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER} \
-           task-gpe-base \
+	   ${SPLASH} \
+	   task-gpe-base \
            task-gpe-apps \
            task-gpe-pim \
            task-gpe-settings \
@@ -33,8 +44,10 @@ IMAGE_INSTALL = "\
     task-gpe-settings \
     task-gpe-apps \
     ${XSERVER} \
+    ${SPLASH} \
     ${GPE_EXTRA_INSTALL}"
 
-#ROOTFS_POSTPROCESS_COMMAND += "zap_root_password; "
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
+ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "demo", "set_image_autologin; ", "",d)}'
 
 inherit image
diff --git a/recipes/llvm/llvm-native.inc b/recipes/llvm/llvm-native.inc
index a7d7fa3830..ab1ce56000 100644
--- a/recipes/llvm/llvm-native.inc
+++ b/recipes/llvm/llvm-native.inc
@@ -1,6 +1,6 @@
 require llvm.inc
 
-DEPENDS = "llvm-common-native"
+DEPENDS = "llvm-common-native cmake-native"
 
 inherit native
 
diff --git a/recipes/llvm/llvm2.6-native_2.5+svnr20090504.bb b/recipes/llvm/llvm2.6-native_2.5+svnr20090511.bb
index 86397c9920..de94d08021 100644
--- a/recipes/llvm/llvm2.6-native_2.5+svnr20090504.bb
+++ b/recipes/llvm/llvm2.6-native_2.5+svnr20090511.bb
@@ -1,15 +1,14 @@
 require llvm-native.inc
 
-SRCREV = "70854"
+SRCREV = "71428"
 
-PV = "2.5+svnr${SRCREV}"
+PV = "2.5+svnr${SRCPV}"
 
 PR = "r0"
 
 SRC_URI = "\
   svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
   file://fix-build.patch;patch=1 \
-  file://llvm-enable-threads-macro.patch;patch=1;pnum=0 \
   file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \
 "
 
diff --git a/recipes/llvm/llvm2.6/fix-build.patch b/recipes/llvm/llvm2.6/fix-build.patch
index 553965608a..fe7a8e4a97 100644
--- a/recipes/llvm/llvm2.6/fix-build.patch
+++ b/recipes/llvm/llvm2.6/fix-build.patch
@@ -1,13 +1,24 @@
+<<<<<<< HEAD:recipes/llvm/llvm2.6/fix-build.patch
 Index: tools/llvm-config/CMakeLists.txt
 ===================================================================
 --- a/tools.orig/llvm-config/CMakeLists.txt	2009-04-09 10:45:01.000000000 +0200
 +++ b/tools/llvm-config/CMakeLists.txt	2009-04-09 10:43:52.000000000 +0200
+=======
+Index: trunk/tools/llvm-config/CMakeLists.txt
+===================================================================
+--- trunk.orig/tools/llvm-config/CMakeLists.txt	2009-04-10 11:56:56.000000000 +0200
++++ trunk/tools/llvm-config/CMakeLists.txt	2009-04-10 12:21:19.000000000 +0200
+>>>>>>> New recipes by Xerxes Ranby (xerxes@zafena.se):recipes/llvm/llvm2.6/fix-build.patch
 @@ -90,7 +90,7 @@
  add_custom_command(OUTPUT ${LLVM_CONFIG}
    COMMAND echo 's!@LLVM_CPPFLAGS@!${CPP_FLGS}!' > temp.sed
    COMMAND echo 's!@LLVM_CFLAGS@!${C_FLGS}!' >> temp.sed
 -  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS}!' >> temp.sed
+<<<<<<< HEAD:recipes/llvm/llvm2.6/fix-build.patch
 +  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden!' >> temp.sed
+=======
++  COMMAND echo 's!@LLVM_CXXFLAGS@!${CXX_FLGS} -fpermissive -fvisibility-inlines-hidden -Woverloaded-virtual!' >> temp.sed
+>>>>>>> New recipes by Xerxes Ranby (xerxes@zafena.se):recipes/llvm/llvm2.6/fix-build.patch
    # TODO: Use general flags for linking! not just for shared libs:
    COMMAND echo 's!@LLVM_LDFLAGS@!${CMAKE_SHARED_LINKER_FLAGS}!' >> temp.sed
    COMMAND echo 's!@LIBS@!!' >> temp.sed                    # TODO: System libs
diff --git a/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch b/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch
deleted file mode 100644
index f1072d9af9..0000000000
--- a/recipes/llvm/llvm2.6/llvm-fix-have_libpthread.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: trunk/include/llvm/Config/config.h.cmake
-===================================================================
---- trunk.orig/include/llvm/Config/config.h.cmake	2009-05-06 16:39:19.957841609 +0200
-+++ trunk/include/llvm/Config/config.h.cmake	2009-05-06 16:39:20.185842055 +0200
-@@ -194,7 +194,7 @@
- #cmakedefine HAVE_LIBPSAPI ${HAVE_LIBPSAPI}
- 
- /* Define to 1 if you have the `pthread' library (-lpthread). */
--#undef HAVE_LIBPTHREAD
-+#cmakedefine HAVE_LIBPTHREAD ${HAVE_LIBPTHREAD}
- 
- /* Define to 1 if you have the `udis86' library (-ludis86). */
- #undef HAVE_LIBUDIS86
-Index: trunk/cmake/config-ix.cmake
-===================================================================
---- trunk.orig/cmake/config-ix.cmake	2009-05-06 16:49:45.121841057 +0200
-+++ trunk/cmake/config-ix.cmake	2009-05-06 16:50:25.738552620 +0200
-@@ -98,6 +98,11 @@
-   if( HAVE_PTHREAD_H OR WIN32 )
-     set(ENABLE_THREADS 1)
-   endif()
-+
-+# FIXME: Actually check for the library
-+  if( HAVE_PTHREAD_H )
-+    set(HAVE_LIBPTHREAD 1)
-+  endif()
- endif()
- 
- if( ENABLE_THREADS )
diff --git a/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch b/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch
deleted file mode 100644
index 6f17b850f6..0000000000
--- a/recipes/llvm/llvm2.6/llvm-fix-pthreads_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: include/llvm/Config/config.h.cmake
-===================================================================
---- include/llvm/Config/config.h.cmake	(Revision 71077)
-+++ include/llvm/Config/config.h.cmake	(Arbeitskopie)
-@@ -276,6 +276,9 @@
- /* Define to have the %a format string */
- #undef HAVE_PRINTF_A
- 
-+/* Have pthread.h */
-+#cmakedefine HAVE_PTHREAD_H ${HAVE_PTHREAD_H}
-+
- /* Have pthread_mutex_lock */
- #cmakedefine HAVE_PTHREAD_MUTEX_LOCK ${HAVE_PTHREAD_MUTEX_LOCK}
- 
diff --git a/recipes/llvm/llvm2.6_2.5+svnr20090504.bb b/recipes/llvm/llvm2.6_2.5+svnr20090511.bb
index 9ba13ceadc..58cb7c7268 100644
--- a/recipes/llvm/llvm2.6_2.5+svnr20090504.bb
+++ b/recipes/llvm/llvm2.6_2.5+svnr20090511.bb
@@ -1,8 +1,8 @@
 require llvm.inc
 
-SRCREV = "70854"
+SRCREV = "71428"
 
-PV = "2.5+svnr${SRCREV}"
+PV = "2.5+svnr${SRCPV}"
 
 PR = "r0"
 
@@ -12,8 +12,6 @@ SRC_URI = "\
   svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \
   file://fix-build.patch;patch=1 \
   file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \
-  file://llvm-fix-pthreads_h.patch;patch=1;pnum=0 \
-  file://llvm-fix-have_libpthread.patch;patch=1 \
 "
 
 S = "${WORKDIR}/trunk"
diff --git a/recipes/psplash/files/topas910/psplash-default b/recipes/psplash/files/topas910/psplash-default
new file mode 100644
index 0000000000..2a29658f0c
--- /dev/null
+++ b/recipes/psplash/files/topas910/psplash-default
@@ -0,0 +1,2 @@
+# Parameters to pass to psplash
+PARAMS=" -a 270"
diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc
index a038f63f1c..c1634de8c2 100644
--- a/recipes/psplash/psplash.inc
+++ b/recipes/psplash/psplash.inc
@@ -8,7 +8,7 @@ RPROVIDES_${PN} = "virtual/psplash"
 RCONFLICTS_${PN} = "exquisite"
 
 PV = "0.0+svnr${SRCREV}"
-PR = "r20"
+PR = "r21"
 
 # You can create your own pslash-hand-img.h by doing
 # ./make-image-header.sh <file>.png HAND
diff --git a/recipes/udev/udev_141.bb b/recipes/udev/udev_141.bb
index 242558bbf4..2368cb9880 100644
--- a/recipes/udev/udev_141.bb
+++ b/recipes/udev/udev_141.bb
@@ -1,23 +1,45 @@
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
-RPROVIDES_${PN} = "hotplug"
+LICENSE = "GPL"
 
-# Untested, fails to creat shared libs
+# Untested, fails to create shared libs
 DEFAULT_PREFERENCE = "-1"
 
+PR = "r1"
+
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://mount.blacklist \
 	   file://run.rules \
 	   "
+SRC_URI += " \
+       file://udev.rules \
+       file://devfs-udev.rules \
+       file://links.conf \
+       file://permissions.rules \
+       file://mount.sh \
+       file://network.sh \
+       file://local.rules \
+       file://init"
 
 SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
 PACKAGE_ARCH_h2200 = "h2200"
 
-require udev.inc
+inherit update-rc.d autotools_stage
 
+INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 03 S ."
 
+PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
+FILES_udev-utils = "${usrbindir}/udevinfo ${sbindir}/udevadm ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+
+RPROVIDES_${PN} = "hotplug"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/udevd"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
+
 FILES_${PN} += "${base_libdir}/udev/*"
 FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 
@@ -51,3 +73,13 @@ do_install () {
 do_install_append_h2200() {
 	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
 }
+
+
+do_stage_append() {
+        install -m 0644 ${S}/extras/volume_id/lib/libvolume_id.h ${STAGING_INCDIR}
+        oe_libinstall -C extras/volume_id/lib -so libvolume_id ${STAGING_LIBDIR}
+}
+
+
+
+
diff --git a/recipes/xserver-common/xserver-common_1.24.bb b/recipes/xserver-common/xserver-common_1.24.bb
new file mode 100644
index 0000000000..a30a37c893
--- /dev/null
+++ b/recipes/xserver-common/xserver-common_1.24.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "Common X11 scripts and support files"
+LICENSE = "GPL"
+SECTION = "x11"
+RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
+PR = "r0"
+
+PACKAGE_ARCH = "all"
+
+# we are using a gpe-style Makefile
+inherit gpe
+
+SRC_URI_append = " file://setDPI.sh "
+
+do_install_append() {
+	install -m 0755 "${WORKDIR}/setDPI.sh" "${D}/etc/X11/Xinit.d/50setdpi"
+}
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate b/recipes/xserver-kdrive-common/xserver-kdrive-common/98xTs_Calibrate
index 70786908b6..70786908b6 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/30xTs_Calibrate
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/98xTs_Calibrate
diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
index abd7191863..33c0a401e4 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common_0.1.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Common X11 scripts"
 LICENSE = "GPL"
 SECTION = "x11"
-PR = "r37"
+PR = "r38"
 
 SRC_URI = "\
   file://Xdefaults \