merge of '38476bfe431d934d649d515b180a82ed3e550822'

     and '4fe9c4e8b248a850a5ab4ace667e3bade4448505'

5 files changed, 46 insertions, 2 deletions

diff --git a/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch b/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch
new file mode 100644
index 0000000000..75ee6bdd6a
--- /dev/null
+++ b/packages/dbus/dbus-1.0.3/sanitize-reply-timeout.patch
@@ -0,0 +1,16 @@
+# DBus is from the desktop world, systems are _FAST_ there
+# On Embedded, some things might take a bit longer
+# Default session bus timeout is 300 seconds(!), whereas default
+# system bus timeout is only 25 seconds. This increases it to 60.
+# Signed off: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
+Index: dbus-1.2.1/bus/system.conf
+===================================================================
+--- dbus-1.2.1.orig/bus/system.conf.in
++++ dbus-1.2.1/bus/system.conf.in
+@@ -65,4 +65,6 @@
+ 
+   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+ 
++  <limit name="reply_timeout">60000</limit>
++
+ </busconfig>
diff --git a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
index 8351856143..cfa200ef3d 100644
--- a/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
+++ b/packages/gstreamer/gst-plugin-pulse_0.9.7.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "GStreamer plugin for using pulse audio as sink and source"
 HOMEPAGE = "http://0pointer.de/lennart/projects/gst-pulse/"
 LICENSE = "GPL"
-DEPENDS = "gstreamer pulseaudio"
+DEPENDS = "gstreamer pulseaudio gst-plugins-base"
 PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-${PV}.tar.gz \
diff --git a/packages/linux/linux-omap/mru-256MB.diff b/packages/linux/linux-omap/mru-256MB.diff
new file mode 100644
index 0000000000..0492ca2d8f
--- /dev/null
+++ b/packages/linux/linux-omap/mru-256MB.diff
@@ -0,0 +1,24 @@
+From: Mans Rullgard <mans@mansr.com>
+Date: Thu, 2 Oct 2008 00:05:33 +0000 (+0100)
+Subject: OMAP: Increase VMALLOC_END to allow 256MB RAM
+X-Git-Url: http://git.mansr.com/?p=linux-omap;a=commitdiff_plain;h=355a0ce968e4a7b0c8d8203f4517296e932e373d
+
+OMAP: Increase VMALLOC_END to allow 256MB RAM
+
+This increases VMALLOC_END to 0x18000000, making room for 256MB
+RAM with the default 128MB vmalloc region.
+
+Signed-off-by: Mans Rullgard <mans@mansr.com>
+---
+
+diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h
+index d8515cb..b97dfaf 100644
+--- a/arch/arm/plat-omap/include/mach/vmalloc.h
++++ b/arch/arm/plat-omap/include/mach/vmalloc.h
+@@ -17,5 +17,5 @@
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+  */
+-#define VMALLOC_END	  (PAGE_OFFSET + 0x17000000)
++#define VMALLOC_END	  (PAGE_OFFSET + 0x18000000)
+ 
diff --git a/packages/linux/linux-omap_git.bb b/packages/linux/linux-omap_git.bb
index 3adc9366ba..b00572771c 100644
--- a/packages/linux/linux-omap_git.bb
+++ b/packages/linux/linux-omap_git.bb
@@ -9,7 +9,7 @@ COMPATIBLE_MACHINE = "omap5912osk|omap1710h3|omap2430sdp|omap2420h4|beagleboard|
 SRCREV = "e1c49d7d22af768188e2a54c167ed79919361e55"
 
 PV = "2.6.26+2.6.27-rc7+${PR}+git${SRCREV}"
-PR = "r10"
+PR = "r11"
 
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git;protocol=git \
 	   file://defconfig"
@@ -32,6 +32,7 @@ SRC_URI_append = " \
            file://mru-enable-overlay-optimalization.diff;patch=1 \
            file://musb-fix-ISO-in-unlink.diff;patch=1 \
            file://musb-fix-multiple-bulk-transfers.diff;patch=1 \
+           file://mru-256MB.diff;patch=1 \
 "
 
 
diff --git a/packages/sharp-binary-only/sharp-flash-header-c700.bb b/packages/sharp-binary-only/sharp-flash-header-c700.bb
index 789c7c2f01..09bb98c461 100644
--- a/packages/sharp-binary-only/sharp-flash-header-c700.bb
+++ b/packages/sharp-binary-only/sharp-flash-header-c700.bb
@@ -2,6 +2,9 @@ SECTION = "base"
 SRC_URI = "file://header-c700.bin"
 LICENSE = "sharp-binary-only"
 COMPATIBLE_MACHINE = '(c7x0|spitz|akita)'
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 do_stage() {
 	install -d ${STAGING_LIBDIR}/sharp-flash-header
 	install -m 0644 ${WORKDIR}/header-c700.bin ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin