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

36 files changed, 125 insertions, 189 deletions

diff --git a/docs/usermanual/chapters/recipes.xml b/docs/usermanual/chapters/recipes.xml
index fdee72c75d..5b0ff143e4 100644
--- a/docs/usermanual/chapters/recipes.xml
+++ b/docs/usermanual/chapters/recipes.xml
@@ -1138,7 +1138,7 @@ PR = "r0"</screen></para>
       is done via the install task, so we need to define a do_install function
       in the recipe to describe how to install the package:<screen>do_install() {
         install -m 0755 -d ${D}${bindir} ${D}${docdir}/myhelloworld
-        install -m 0644 ${S}/myhelloworld ${D}${bindir}
+        install -m 0755 ${S}/myhelloworld ${D}${bindir}
         install -m 0644 ${WORKDIR}/README.txt ${D}${docdir}/myhelloworld
 }</screen></para>
 
diff --git a/recipes/cacao/cacao.inc b/recipes/cacao/cacao.inc
index d7bb425576..c366b7486a 100644
--- a/recipes/cacao/cacao.inc
+++ b/recipes/cacao/cacao.inc
@@ -34,7 +34,7 @@ EXTRA_OECONF = "\
 
 PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
 
-FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN} = "${bindir}/${PN} ${libdir}/cacao/lib*.so ${libdir}/lib*.so* ${datadir}/${PN}"
 FILES_${PN}-doc = "${datadir}/man"
 FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
 
diff --git a/recipes/cacao/cacao_0.99.3.bb b/recipes/cacao/cacao_0.99.3.bb
index e4fd4955e6..e407b8c3ca 100644
--- a/recipes/cacao/cacao_0.99.3.bb
+++ b/recipes/cacao/cacao_0.99.3.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "\
   http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
diff --git a/recipes/cacao/cacao_0.99.4.bb b/recipes/cacao/cacao_0.99.4.bb
index 7d3cfa37ea..98e8511a2c 100644
--- a/recipes/cacao/cacao_0.99.4.bb
+++ b/recipes/cacao/cacao_0.99.4.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "\
 	http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
diff --git a/recipes/freesmartphone/cornucopia.inc b/recipes/freesmartphone/cornucopia.inc
index 8fe90d8777..514eb6c2f3 100644
--- a/recipes/freesmartphone/cornucopia.inc
+++ b/recipes/freesmartphone/cornucopia.inc
@@ -7,7 +7,7 @@ DEPENDS = "vala-native glib-2.0 dbus dbus-glib libfso-glib libgee"
 DEPENDS += "${@['libfsoframework', ''][(bb.data.getVar('PN', d, 1) in 'libfsoframework libfsobasics'.split())]}"
 PV = "invalid, please override"
 
-FSO_CORNUCOPIA_SRCREV ?= "6a1802b0ca2f3802351833fc221ea69d099190eb"
+FSO_CORNUCOPIA_SRCREV ?= "f248cb38db9f531393391984284de96e8ff4e264"
 INC_PR = "r2"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia;protocol=git;branch=master"
diff --git a/recipes/freesmartphone/frameworkd/0001-ogpsd-update-sysfs-node-for-2.6.32-kernels-on-freeru.patch b/recipes/freesmartphone/frameworkd/0001-ogpsd-update-sysfs-node-for-2.6.32-kernels-on-freeru.patch
deleted file mode 100644
index 6db2eb84ea..0000000000
--- a/recipes/freesmartphone/frameworkd/0001-ogpsd-update-sysfs-node-for-2.6.32-kernels-on-freeru.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From b44f024e80fa8d33d4809b6eaeabc5b46357ca4f Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 25 May 2010 13:03:43 +0200
-Subject: [PATCH 1/2] ogpsd: update sysfs node for 2.6.32+ kernels on freerunner
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- framework/subsystems/ogpsd/om.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/framework/subsystems/ogpsd/om.py b/framework/subsystems/ogpsd/om.py
-index c5ec10d..19ceb5c 100644
---- a/framework/subsystems/ogpsd/om.py
-+++ b/framework/subsystems/ogpsd/om.py
-@@ -13,7 +13,7 @@ __version__ = "0.9.9.4"
- MODULE_NAME = "ogpsd"
- 
- DEVICE_POWER_PATH_OLD = "/sys/bus/platform/devices/neo1973-pm-gps.0/pwron"
--DEVICE_POWER_PATH_NEW = "/sys/bus/platform/devices/neo1973-pm-gps.0/power_on"
-+DEVICE_POWER_PATH_NEW = "/sys/bus/platform/devices/gta02-pm-gps.0/power_on"
- 
- from ubx import UBXDevice
- from ubx import CLIDPAIR
--- 
-1.7.1
-
diff --git a/recipes/freesmartphone/frameworkd/0002-ogsmd-ti_calipsy-update-sysfs-node-for-2.6.32-kernel.patch b/recipes/freesmartphone/frameworkd/0002-ogsmd-ti_calipsy-update-sysfs-node-for-2.6.32-kernel.patch
deleted file mode 100644
index 48413f88b6..0000000000
--- a/recipes/freesmartphone/frameworkd/0002-ogsmd-ti_calipsy-update-sysfs-node-for-2.6.32-kernel.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 11fad6cb429cb98a16de5f7f0bd676dff576716d Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 25 May 2010 13:04:14 +0200
-Subject: [PATCH 2/2] ogsmd ti_calipsy: update sysfs node for 2.6.32+ kernels on freerunner
-
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- .../subsystems/ogsmd/modems/ti_calypso/modem.py    |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
-index c7a5b6f..bc48052 100644
---- a/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
-+++ b/framework/subsystems/ogsmd/modems/ti_calypso/modem.py
-@@ -15,9 +15,9 @@ __version__ = "0.9.9.10"
- MODULE_NAME = "ogsmd.modems.ti_calypso"
- 
- DEVICE_CALYPSO_PATH             = "/dev/ttySAC0"
--SYSFS_CALYPSO_POWER_PATH        = "/sys/bus/platform/devices/neo1973-pm-gsm.0/power_on"
--SYSFS_CALYPSO_RESET_PATH        = "/sys/bus/platform/devices/neo1973-pm-gsm.0/reset"
--SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/neo1973-pm-gsm.0/flowcontrolled"
-+SYSFS_CALYPSO_POWER_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/power_on"
-+SYSFS_CALYPSO_RESET_PATH        = "/sys/bus/platform/devices/gta02-pm-gsm.0/reset"
-+SYSFS_CALYPSO_FLOW_CONTROL_PATH = "/sys/bus/platform/devices/gta02-pm-gsm.0/flowcontrolled"
- 
- import mediator
- 
--- 
-1.7.1
-
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 9dfb107ebe..e47e66551e 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -4,7 +4,7 @@ AUTHOR = "FreeSmartphone.Org Development Team"
 SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
-SRCREV = "8f618948c4c74853f28b773cdc74ceefa1fb6899"
+SRCREV = "5ed055335b251b290179928bd0d56b5476759876"
 PV = "0.9.5.9+gitr${SRCPV}"
 PR = "r5"
 PE = "1"
@@ -15,8 +15,6 @@ INITSCRIPT_NAME = "frameworkd"
 INITSCRIPT_PARAMS = "defaults 29"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
-           file://0001-ogpsd-update-sysfs-node-for-2.6.32-kernels-on-freeru.patch \
-           file://0002-ogsmd-ti_calipsy-update-sysfs-node-for-2.6.32-kernel.patch \
            file://frameworkd \
            file://frameworkd.conf \
 	   "
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index 81976696b5..bc973a310e 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -32,8 +32,6 @@ CONFFILES_${PN} = "${sysconfdir}/freesmartphone/conf/openmoko_gta/fsodeviced.con
 do_install_append() {
 	install -d ${D}${sysconfdir}/init.d/
 	install -m 0755 ${WORKDIR}/fsodeviced ${D}${sysconfdir}/init.d/
-	rm -f ${D}${sysconfdir}/freesmartphone/conf/openmoko_gta/alsa-default
-	ln -s alsa-2.6.31 ${D}${sysconfdir}/freesmartphone/conf/openmoko_gta/alsa-default
 }
 
 pkg_preinst_${PN} () {
diff --git a/recipes/freesmartphone/fsogsmd_git.bb b/recipes/freesmartphone/fsogsmd_git.bb
index 1de4533d45..e2cbd53e27 100644
--- a/recipes/freesmartphone/fsogsmd_git.bb
+++ b/recipes/freesmartphone/fsogsmd_git.bb
@@ -7,9 +7,6 @@ PE = "1"
 
 DEPENDS += "libfsoresource libgsm0710mux ppp msmcommd"
 
-SRC_URI_append_om-gta01 = " file://0001-fsogsmd-update-sysfs-node-in-config-for-openmoko_gta.patch;striplevel=2"
-SRC_URI_append_om-gta02 = " file://0001-fsogsmd-update-sysfs-node-in-config-for-openmoko_gta.patch;striplevel=2"
-
 EXTRA_OECONF_append = "\
   --enable-libgsm0710mux \
   --enable-modem-qualcomm-palm \
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index 5e41087708..cfa6ef3698 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -5,7 +5,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 DEPENDS = "glib-2.0 dbus dbus-glib"
-SRCREV = "c9629132869ab84c70ff58be458e138bcb0e9c58"
+SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
 PR = "${INC_PR}.0"
 PE = "1"
diff --git a/recipes/gtk+/gtk+-2.20.0/cross-nm.patch b/recipes/gtk+/gtk+-2.20.0/cross-nm.patch
new file mode 100644
index 0000000000..36e9557009
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.20.0/cross-nm.patch
@@ -0,0 +1,13 @@
+Index: gtk+-2.20.1/configure.in
+===================================================================
+--- gtk+-2.20.1.orig/configure.in	2010-07-10 16:25:40.000000000 -0700
++++ gtk+-2.20.1/configure.in	2010-07-12 22:08:49.878377002 -0700
+@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_PROG(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE
diff --git a/recipes/gtk+/gtk+-2.20.1/cross-nm.patch b/recipes/gtk+/gtk+-2.20.1/cross-nm.patch
new file mode 100644
index 0000000000..36e9557009
--- /dev/null
+++ b/recipes/gtk+/gtk+-2.20.1/cross-nm.patch
@@ -0,0 +1,13 @@
+Index: gtk+-2.20.1/configure.in
+===================================================================
+--- gtk+-2.20.1.orig/configure.in	2010-07-10 16:25:40.000000000 -0700
++++ gtk+-2.20.1/configure.in	2010-07-12 22:08:49.878377002 -0700
+@@ -202,7 +202,7 @@ m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
+ AC_SYS_LARGEFILE
+ 
+ AM_PROG_AS
+-AC_PATH_PROG(NM, nm, nm)
++AC_CHECK_PROG(NM, nm, nm)
+ 
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE
diff --git a/recipes/gtk+/gtk+_2.20.0.bb b/recipes/gtk+/gtk+_2.20.0.bb
index 68bf212a6b..70799798dd 100644
--- a/recipes/gtk+/gtk+_2.20.0.bb
+++ b/recipes/gtk+/gtk+_2.20.0.bb
@@ -2,11 +2,12 @@ require gtk+.inc
 
 SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
+SRC_URI_append = " file://cross-nm.patch"
 
 SRC_URI[gtk.md5sum] = "5517f78b1eb9b1eb60bd48a0152d09e6"
 SRC_URI[gtk.sha256sum] = "8ea7e11ff88e9a8867b7d9221d40a3bfce5c648ce27cd6bac422ff8f6cca414d"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 BBCLASSEXTEND = "native"
 
diff --git a/recipes/gtk+/gtk+_2.20.1.bb b/recipes/gtk+/gtk+_2.20.1.bb
index b0c523088d..c7efb29ce5 100644
--- a/recipes/gtk+/gtk+_2.20.1.bb
+++ b/recipes/gtk+/gtk+_2.20.1.bb
@@ -2,12 +2,14 @@ require gtk+.inc
 
 SRC_URI_append_virtclass-native = " file://no-demos.patch \
 "
-SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch"
+SRC_URI_append = "file://gtk-dnd-grab-deadlock-fix.patch \
+		  file://cross-nm.patch \
+		 "
 
 SRC_URI[gtk.md5sum] = "53e6f3a93bd22934878fc4a4a34c68aa"
 SRC_URI[gtk.sha256sum] = "0e081731d21e34ff45c82199490c2889504fa8b3c7e117c043e82ababaec0f65"
 
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 BBCLASSEXTEND = "native"
 
diff --git a/recipes/jamvm/files/jamvm_1.4.5-initial.patch b/recipes/jamvm/files/jamvm_1.4.5-initial.patch
index 3c68818955..175052dbf3 100644
--- a/recipes/jamvm/files/jamvm_1.4.5-initial.patch
+++ b/recipes/jamvm/files/jamvm_1.4.5-initial.patch
@@ -14,12 +14,21 @@ Index: jamvm-1.4.5/java-initial
 ===================================================================
 --- /dev/null
 +++ jamvm-1.4.5/java-initial
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,14 @@
 +#!/bin/sh
 +#
-+# Wrapper script inspired by the one provided by cacao.
++# Wrapper which (almost) silently restarts the VM in case of segfaults.
 +
-+exec jamvm-initial ${1+"$@"}
++redo_from_start=1;
++while [ $redo_from_start -eq 1 ]; do
++    echo "Running JamVM-initial: ${@}"
++    redo_from_start=0;
++    jamvm-initial ${1+"$@"}
++    if [ $? -eq 139 ]; then
++        echo "JamVM-initial crashed - silently trying again"
++        redo_from_start=1;
++    fi
++done
 Index: jamvm-1.4.5/lib/Makefile.am
 ===================================================================
 --- jamvm-1.4.5.orig/lib/Makefile.am
diff --git a/recipes/jamvm/files/jamvm_1.5.0-initial.patch b/recipes/jamvm/files/jamvm_1.5.0-initial.patch
index 9b972da014..1f63dba3e3 100644
--- a/recipes/jamvm/files/jamvm_1.5.0-initial.patch
+++ b/recipes/jamvm/files/jamvm_1.5.0-initial.patch
@@ -15,12 +15,21 @@ Index: jamvm-1.5.0/java-initial
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ jamvm-1.5.0/java-initial	2007-12-20 00:03:27.000000000 +0100
-@@ -0,0 +1,5 @@
+@@ -0,0 +1,14 @@
 +#!/bin/sh
 +#
-+# Wrapper script inspired by the one provided by cacao.
++# Wrapper which (almost) silently restarts the VM in case of segfaults.
 +
-+exec jamvm-initial ${1+"$@"}
++redo_from_start=1;
++while [ $redo_from_start -eq 1 ]; do
++    echo "Running JamVM-initial: ${@}"
++    redo_from_start=0;
++    jamvm-initial ${1+"$@"}
++    if [ $? -eq 139 ]; then
++        echo "JamVM-initial crashed - silently trying again"
++        redo_from_start=1;
++    fi
++done
 Index: jamvm-1.5.0/lib/Makefile.am
 ===================================================================
 --- jamvm-1.5.0.orig/lib/Makefile.am	2007-12-20 00:05:24.000000000 +0100
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index e3ace6dbdb..4620c66baf 100644
--- a/recipes/jamvm/jamvm-initial_1.4.5.bb
+++ b/recipes/jamvm/jamvm-initial_1.4.5.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native"
 
-PR = "r1"
+PR = "r3"
 
 PROVIDES = "virtual/java-initial"
 
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index 3986861a1a..8a3a050793 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL"
 
 DEPENDS = "zlib-native classpath-initial jikes-initial libffi-native"
 
-PR = "r1"
+PR = "r3"
 
 PROVIDES = "virtual/java-initial"
 
diff --git a/recipes/jamvm/jamvm.inc b/recipes/jamvm/jamvm.inc
index 1181d16cbf..811a8116d8 100644
--- a/recipes/jamvm/jamvm.inc
+++ b/recipes/jamvm/jamvm.inc
@@ -19,6 +19,8 @@ inherit java autotools update-alternatives
 EXTRA_OECONF = "--with-classpath-install-dir=${prefix} --libdir=${libdir}/jamvm"
 CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
 
+FILES_${PN} += "${libdir}/jamvm/lib*.so"
+
 ALTERNATIVE_NAME = "java"
 ALTERNATIVE_PATH = "${bindir}/jamvm"
 ALTERNATIVE_PRIORITY = "4"
diff --git a/recipes/jamvm/jamvm_1.4.5.bb b/recipes/jamvm/jamvm_1.4.5.bb
index 2f61fdc5a3..853b0b74ea 100644
--- a/recipes/jamvm/jamvm_1.4.5.bb
+++ b/recipes/jamvm/jamvm_1.4.5.bb
@@ -1,6 +1,6 @@
 require jamvm.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://jamvm-1.3.1-size-defaults.patch"
 
diff --git a/recipes/jamvm/jamvm_1.5.0.bb b/recipes/jamvm/jamvm_1.5.0.bb
index dbb27bd66a..bcedb3ab9a 100644
--- a/recipes/jamvm/jamvm_1.5.0.bb
+++ b/recipes/jamvm/jamvm_1.5.0.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;striplevel=0"
 
-PR = "r6"
+PR = "r7"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/recipes/jamvm/jamvm_1.5.2.bb b/recipes/jamvm/jamvm_1.5.2.bb
index 2fd5f959c8..e47c4e1e2b 100644
--- a/recipes/jamvm/jamvm_1.5.2.bb
+++ b/recipes/jamvm/jamvm_1.5.2.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;striplevel=0"
 
-PR = "r2"
+PR = "r3"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/recipes/jamvm/jamvm_1.5.3.bb b/recipes/jamvm/jamvm_1.5.3.bb
index a496d42505..e84c349124 100644
--- a/recipes/jamvm/jamvm_1.5.3.bb
+++ b/recipes/jamvm/jamvm_1.5.3.bb
@@ -2,7 +2,7 @@ require jamvm.inc
 
 SRC_URI += "file://debian-jni.patch;striplevel=0"
 
-PR = "r2"
+PR = "r3"
 
 do_configure_prepend() {
   # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
diff --git a/recipes/kexecboot/linux-kexecboot_git.bb b/recipes/kexecboot/linux-kexecboot_git.bb
index a5e48336ac..869fcc7231 100644
--- a/recipes/kexecboot/linux-kexecboot_git.bb
+++ b/recipes/kexecboot/linux-kexecboot_git.bb
@@ -1,7 +1,7 @@
 require linux-kexecboot.inc
 
-KERNEL_RELEASE = "2.6.35-rc3"
-SRCREV = "980019d74e4b2428362b36a0506519d6d9460800"
+KERNEL_RELEASE = "2.6.35-rc5"
+SRCREV = "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c"
 PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
 
 SRC_URI += "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
diff --git a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch b/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch
deleted file mode 100644
index 1f996fafaf..0000000000
--- a/recipes/linux/linux-openmoko-2.6.34/0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 10e7f7b2132aaac8e3ebc549d3837cc2df888df7 Mon Sep 17 00:00:00 2001
-From: Thibaut Girka <thib@sitedethib.com>
-Date: Tue, 29 Jun 2010 12:54:03 +0200
-Subject: [PATCH] glamo-mci: add MMC_CAP_NONREMOVABLE and move enable_irq to right place
-
----
- drivers/mmc/host/glamo-mci.c |    5 +++--
- 1 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mmc/host/glamo-mci.c b/drivers/mmc/host/glamo-mci.c
-index b2442c2..11deb7d 100644
---- a/drivers/mmc/host/glamo-mci.c
-+++ b/drivers/mmc/host/glamo-mci.c
-@@ -811,6 +811,7 @@ static int glamo_mci_probe(struct platform_device *pdev)
- 	mmc->ocr_avail	= mmc_regulator_get_ocrmask(host->regulator);
- 	mmc->caps	= MMC_CAP_4_BIT_DATA |
- 			    MMC_CAP_MMC_HIGHSPEED |
-+			    MMC_CAP_NONREMOVABLE |
- 			    MMC_CAP_SD_HIGHSPEED;
- 	mmc->f_min	= host->clk_rate / 256;
- 	mmc->f_max	= sd_max_clk;
-@@ -930,10 +931,10 @@ static int glamo_mci_resume(struct device *dev)
- 	glamo_mci_reset(host);
- 	mdelay(10);
- 
--	ret = mmc_resume_host(host->mmc);
--
- 	enable_irq(host->irq);
- 
-+	ret = mmc_resume_host(host->mmc);
-+
- 	mmc_host_lazy_disable(host->mmc);
- 
- 	return ret;
--- 
-1.7.1
-
diff --git a/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig b/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
index 1ef24e5437..c54bd40a46 100644
--- a/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
+++ b/recipes/linux/linux-openmoko-2.6.34/om-gta02/defconfig
@@ -907,10 +907,10 @@ CONFIG_MTD_UBI_GLUEBI=y
 #
 # UBI debugging options
 #
-CONFIG_MTD_UBI_DEBUG=y
+# CONFIG_MTD_UBI_DEBUG is not set
 # CONFIG_MTD_UBI_DEBUG_MSG is not set
 # CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
+# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set
 # CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
 # CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
 # CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
@@ -1951,9 +1951,9 @@ CONFIG_UBIFS_FS_XATTR=y
 CONFIG_UBIFS_FS_ADVANCED_COMPR=y
 CONFIG_UBIFS_FS_LZO=y
 CONFIG_UBIFS_FS_ZLIB=y
-CONFIG_UBIFS_FS_DEBUG=y
-CONFIG_UBIFS_FS_DEBUG_MSG_LVL=0
-CONFIG_UBIFS_FS_DEBUG_CHKS=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+# CONFIG_UBIFS_FS_DEBUG_MSG_LVL is not set
+# CONFIG_UBIFS_FS_DEBUG_CHKS is not set
 # CONFIG_LOGFS is not set
 # CONFIG_CRAMFS is not set
 CONFIG_SQUASHFS=m
diff --git a/recipes/linux/linux-openmoko-2.6.34_git.bb b/recipes/linux/linux-openmoko-2.6.34_git.bb
index 5ba2196ce8..6b21e01a0d 100644
--- a/recipes/linux/linux-openmoko-2.6.34_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.34_git.bb
@@ -3,8 +3,8 @@ require linux-openmoko.inc
 
 KERNEL_RELEASE="2.6.34"
 
-SRCREV = "4ce5f33cd4bcde2e25d50ae0880eb39213e2b6d2"
-OEV = "oe4.2"
+SRCREV = "3f6725d43021d2d7597027e36020df5b44d0667e"
+OEV = "oe4.3"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}"
 
 SRC_URI = "\
@@ -29,8 +29,6 @@ SRC_URI = "\
   file://0002-usbhost.patch.patch \
   file://0003-ar6000_delay.patch.patch \
   file://0004-save_regs.patch.patch \
-# possible resume fix  
-  file://0001-glamo-mci-add-MMC_CAP_NONREMOVABLE.patch \
   file://defconfig \
 "
 
diff --git a/recipes/linux/linux/spitz/defconfig b/recipes/linux/linux/spitz/defconfig
index 79231c7535..f098d75d1a 100644
--- a/recipes/linux/linux/spitz/defconfig
+++ b/recipes/linux/linux/spitz/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.35-rc3
-# Sun Jun 20 08:14:33 2010
+# Linux kernel version: 2.6.35-rc4
+# Thu Jul  8 10:27:47 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -70,8 +70,13 @@ CONFIG_LOG_BUF_SHIFT=14
 # CONFIG_SYSFS_DEPRECATED_V2 is not set
 # CONFIG_RELAY is not set
 # CONFIG_NAMESPACES is not set
-# CONFIG_BLK_DEV_INITRD is not set
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_LZO=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_SYSCTL=y
 CONFIG_ANON_INODES=y
 CONFIG_EMBEDDED=y
@@ -423,6 +428,7 @@ CONFIG_BINFMT_MISC=m
 CONFIG_PM=y
 # CONFIG_PM_DEBUG is not set
 CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND_NVS=y
 CONFIG_SUSPEND=y
 CONFIG_SUSPEND_FREEZER=y
 CONFIG_APM_EMULATION=y
@@ -933,15 +939,15 @@ CONFIG_IDE_PROC_FS=y
 #
 # IDE chipset support/bugfixes
 #
-# CONFIG_BLK_DEV_PLATFORM is not set
+CONFIG_BLK_DEV_PLATFORM=y
 # CONFIG_BLK_DEV_IDEDMA is not set
 
 #
 # SCSI device support
 #
-CONFIG_SCSI_MOD=m
+CONFIG_SCSI_MOD=y
 # CONFIG_RAID_ATTRS is not set
-CONFIG_SCSI=m
+CONFIG_SCSI=y
 CONFIG_SCSI_DMA=y
 # CONFIG_SCSI_TGT is not set
 # CONFIG_SCSI_NETLINK is not set
@@ -980,7 +986,7 @@ CONFIG_SCSI_LOWLEVEL=y
 # CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_OSD_INITIATOR is not set
-CONFIG_ATA=m
+CONFIG_ATA=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_VERBOSE_ERROR=y
 CONFIG_SATA_PMP=y
@@ -1008,7 +1014,7 @@ CONFIG_ATA_BMDMA=y
 #
 # PIO-only SFF controllers
 #
-# CONFIG_PATA_PCMCIA is not set
+CONFIG_PATA_PCMCIA=y
 # CONFIG_PATA_PLATFORM is not set
 
 #
@@ -1264,7 +1270,7 @@ CONFIG_HW_RANDOM=m
 # CONFIG_IPWIRELESS is not set
 # CONFIG_RAW_DRIVER is not set
 # CONFIG_TCG_TPM is not set
-# CONFIG_RAMOOPS is not set
+CONFIG_RAMOOPS=y
 CONFIG_I2C=y
 CONFIG_I2C_BOARDINFO=y
 CONFIG_I2C_COMPAT=y
@@ -2316,6 +2322,10 @@ CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
 CONFIG_LZO_COMPRESS=y
 CONFIG_LZO_DECOMPRESS=y
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_LZO=y
 CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT=y
 CONFIG_HAS_DMA=y
diff --git a/recipes/linux/linux_git.bb b/recipes/linux/linux_git.bb
index 2598bc6ccb..04257534bf 100644
--- a/recipes/linux/linux_git.bb
+++ b/recipes/linux/linux_git.bb
@@ -1,7 +1,7 @@
 require linux.inc
 
-KERNEL_RELEASE = "2.6.35-rc3"
-SRCREV = "980019d74e4b2428362b36a0506519d6d9460800"
+KERNEL_RELEASE = "2.6.35-rc5"
+SRCREV = "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c"
 PV = "${KERNEL_RELEASE}+gitr${SRCPV}"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git;protocol=git;branch=master \
diff --git a/recipes/llvm/llvm-common.bb b/recipes/llvm/llvm-common.bb
index a2dad52b43..3de8f7f7b2 100644
--- a/recipes/llvm/llvm-common.bb
+++ b/recipes/llvm/llvm-common.bb
@@ -2,6 +2,8 @@ PR = "r1"
 
 DESCRIPTION = "Helper script for OE's llvm support"
 
+PR = "r1"
+
 BBCLASSEXTEND = "native"
 
 SRC_URI = "file://llvm-config"
@@ -14,3 +16,15 @@ do_install() {
   install -d ${D}${bindir}
   install -m 0755 ${WORKDIR}/llvm-config ${D}${bindir}
 }
+
+# For llvm-common the script should end up in STAGING_BINDIR_CROSS
+# and for llvm-common-native it should be in STAGING_BINDIR. The
+# script works together with a script that is installed by a
+# corresponding llvm(-native) package.
+DESTINATION = "${STAGING_BINDIR_CROSS}"
+DESTINATION_virtclass-native = "${STAGING_BINDIR}"
+
+do_stage() {
+  install -d ${DESTINATION}
+  install -m 0755 ${WORKDIR}/llvm-config ${DESTINATION}
+}
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index 4f4c468a78..f09360facf 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -104,7 +104,8 @@ do_configure() {
 }
 do_compile() {
         if test "${MACHINE}" != "native"; then
-            sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' ext/Errno/Errno_pm.PL
+            sed -i -e 's|/usr/include|${STAGING_INCDIR}|g' \
+                   -e 's|$Config{cppflags}||' ext/Errno/Errno_pm.PL
         fi
         cd Cross
         oe_runmake perl LD="${TARGET_SYS}-gcc"
diff --git a/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch b/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch
deleted file mode 100644
index 1f29c4480f..0000000000
--- a/recipes/shr/libphone-ui/0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 47df8a90652e3b22692d2ad7ee3b0219d7651f3a Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Tue, 25 May 2010 13:09:17 +0200
-Subject: [PATCH] libphoneui.conf: update alsa control name for 2.6.31+
-
----
- data/libphoneui.conf |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/data/libphoneui.conf b/data/libphoneui.conf
-index 980ef10..f8bfc3f 100644
---- a/data/libphoneui.conf
-+++ b/data/libphoneui.conf
-@@ -46,18 +46,18 @@ hardware_control_name = hw:0
- [alsa_control_speaker]
- speaker = Headphone Playback Volume
- microphone = Mono Playback Volume
--microphone_mute = Mono Mixer Sidetone Playback Sw
-+microphone_mute = Mono Mixer Sidetone Playback Switch
- 
- [alsa_control_handset]
- speaker = Speaker Playback Volume
- speaker_min = 90
- microphone = Mono Playback Volume
--microphone_mute = Mono Mixer Sidetone Playback Sw
-+microphone_mute = Mono Mixer Sidetone Playback Switch
- 
- [alsa_control_headset]
- speaker = Headphone Playback Volume
- microphone = Mono Playback Volume
--microphone_mute = Mono Mixer Sidetone Playback Sw
-+microphone_mute = Mono Mixer Sidetone Playback Switch
- 
- [alsa_control_bluetooth]
- speaker = Speaker Playback Volume
--- 
-1.7.1
-
diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb
index ab785e94b2..327524ae5d 100644
--- a/recipes/shr/libphone-ui_git.bb
+++ b/recipes/shr/libphone-ui_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "A generic framework for phone ui"
 HOMEPAGE = "http://shr-project.org/"
 LICENSE = "GPL"
 SECTION = "libs"
-SRCREV = "2a87a548f004d7e7c7a45cdca5816b552e2b1796"
+SRCREV = "cac36ceb360c457b8dce993f6363cf8688ab428a"
 PV = "0.0.0+gitr${SRCPV}"
 PR = "r0"
 
@@ -10,8 +10,7 @@ DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libfso-glib libfsoframework libph
 
 inherit pkgconfig autotools autotools_stage
 
-SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master \
-           file://0001-libphoneui.conf-update-alsa-control-name-for-2.6.31.patch"
+SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master"
 
 S="${WORKDIR}/git"
 
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 550725a106..4e7c8c0040 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r59"
+PR = "r60"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -59,6 +59,8 @@ RDEPENDS_${PN} += "\
 		shr-splash-theme-simple \
 		shr-splash-theme-dontpanic \
 		shr-splash-theme-handy \
+		shr-splash-theme-tux \
+		shr-splash-theme-logo \
 		vagalume \
 		wireshark \
 		x11vnc \
diff --git a/recipes/xserver-common/xserver-common_1.33.bb b/recipes/xserver-common/xserver-common_1.33.bb
index 470bc4c7ab..cb644a41f0 100644
--- a/recipes/xserver-common/xserver-common_1.33.bb
+++ b/recipes/xserver-common/xserver-common_1.33.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files"
 LICENSE = "GPL"
 SECTION = "x11"
 RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo"
-PR = "r3"
+PR = "r4"
 
 PACKAGE_ARCH = "all"
 DEFAULT_PREFERENCE = "-1"
@@ -23,6 +23,7 @@ SRC_URI_append = " file://loop.patch;striplevel=3 \
 
 SRC_URI_append_angstrom = " file://xtscal-fix.patch "
 RDEPENDS_${PN}_append_angstrom = " tslib-calibrate "
+RDEPENDS_${PN}_append_shr = " xinput-calibrator "
 
 SRC_URI_append_shr = " file://89xTs_Calibrate.xinput_calibrator.patch \
                        file://90xXWindowManager.patch \