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

45 files changed, 5268 insertions, 78 deletions

diff --git a/recipes/cairo/cairomm_1.8.2.bb b/recipes/cairo/cairomm_1.8.2.bb
new file mode 100644
index 0000000000..11b3e0ebbf
--- /dev/null
+++ b/recipes/cairo/cairomm_1.8.2.bb
@@ -0,0 +1,7 @@
+require cairo.inc
+
+DEPENDS = "cairo"
+DESCRIPTION = "C++ bindings for Cairo graphics library"
+
+SRC_URI = "http://cairographics.org/releases/cairomm-${PV}.tar.gz"
+
diff --git a/recipes/classpath/classpath-native.inc b/recipes/classpath/classpath-native.inc
index dba97769e7..e7570c4f98 100644
--- a/recipes/classpath/classpath-native.inc
+++ b/recipes/classpath/classpath-native.inc
@@ -34,6 +34,7 @@ EXTRA_OECONF = "\
   --enable-tools \
   --includedir=${STAGING_INCDIR}/classpath \
   --with-vm=java \
+  --enable-tool-wrappers \
   "
 
 do_stage() {
diff --git a/recipes/classpath/classpath-native_0.97.2.bb b/recipes/classpath/classpath-native_0.97.2.bb
index 0024136b97..8a2c36b5c7 100644
--- a/recipes/classpath/classpath-native_0.97.2.bb
+++ b/recipes/classpath/classpath-native_0.97.2.bb
@@ -1,6 +1,6 @@
 require classpath-native.inc
 
-PR = "r4"
+PR = "r5"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
diff --git a/recipes/classpath/classpath-native_0.98.bb b/recipes/classpath/classpath-native_0.98.bb
index 710958a550..9f4c8f9077 100644
--- a/recipes/classpath/classpath-native_0.98.bb
+++ b/recipes/classpath/classpath-native_0.98.bb
@@ -3,7 +3,7 @@ require classpath-native.inc
 # Deadlocks occur on at least amd64 hosts.
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 # The code affected by the javanet-local patch
 # is usually not compiled. However if someone changes
diff --git a/recipes/ekiga/opal_3.6.6.bb b/recipes/ekiga/opal_3.6.6.bb
new file mode 100644
index 0000000000..502c344b13
--- /dev/null
+++ b/recipes/ekiga/opal_3.6.6.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "Open Phone Abstraction Library, implementation of the ITU H.323 teleconferencing protocol, and successor of the openh323 library."
+LICENSE = "MPL"
+
+inherit gnome
+
+DEPENDS += " ffmpeg ptlib virtual/libsdl openldap"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/opal-${PV}.tar.bz2 \
+           file://configure.diff;patch=1 \
+          "
+
+EXTRA_OECONF = "--enable-localgsm --disable-spandsp "
+ARM_INSTRUCTION_SET = "arm"
+
+TARGET_CC_ARCH += "${LDFLAGS}"
+
+do_configure() {
+	libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+FILES_${PN} += "${libdir}/opal-${PV}/*/*.so ${libdir}/opal-${PV}/*/*/*.so"
+FILES_${PN}-dbg += "${libdir}/opal-${PV}/*/.debug ${libdir}/opal-${PV}/*/*/.debug"
+
+do_stage() {
+	autotools_stage_all
+}
+
diff --git a/recipes/ekiga/ptlib_2.6.5.bb b/recipes/ekiga/ptlib_2.6.5.bb
new file mode 100644
index 0000000000..5466292361
--- /dev/null
+++ b/recipes/ekiga/ptlib_2.6.5.bb
@@ -0,0 +1,34 @@
+DESCRIPTION = "Portable Tools Libary"
+LICENSE = "MPL"
+
+inherit gnome
+
+DEPENDS += "libgsm openldap openssl expat virtual/libsdl alsa-lib"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/opalvoip/ptlib-${PV}.tar.bz2"
+
+do_configure() {
+    libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+do_compile_append() {
+        sed -i -e s:${STAGING_DIR_TARGET}::g \
+               -e s:/${TARGET_SYS}::g \
+                  ptlib.pc
+}
+
+do_install_append() {
+	chmod +x ${D}${libdir}/*
+}
+
+FILES_${PN} += "${libdir}/ptlib-${PV}/*/*/*.so"
+
+do_stage() {
+	autotools_stage_all
+}
+
+
+
+
diff --git a/recipes/fastcgi/fastcgi_2.4.0.bb b/recipes/fastcgi/fastcgi_2.4.0.bb
index 4c70aa3461..a575da1d84 100644
--- a/recipes/fastcgi/fastcgi_2.4.0.bb
+++ b/recipes/fastcgi/fastcgi_2.4.0.bb
@@ -1,9 +1,10 @@
 LICENSE = "Open Market"
 DESCRIPTION = "Fast CGI backend (web server to CGI handler) library"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.fastcgi.com/dist/fcgi-${PV}.tar.gz \
-file://link-against-math.patch;patch=1"
+file://link-against-math.patch;patch=1 \
+file://cstdio.patch;patch=1 "
 
 S=${WORKDIR}/fcgi-${PV}
 
diff --git a/recipes/fastcgi/files/cstdio.patch b/recipes/fastcgi/files/cstdio.patch
new file mode 100644
index 0000000000..90ce2e7e0b
--- /dev/null
+++ b/recipes/fastcgi/files/cstdio.patch
@@ -0,0 +1,12 @@
+Index: fcgi-2.4.0/libfcgi/fcgio.cpp
+===================================================================
+--- fcgi-2.4.0.orig/libfcgi/fcgio.cpp	2009-09-16 23:20:20.504735309 +0200
++++ fcgi-2.4.0/libfcgi/fcgio.cpp	2009-09-16 23:20:34.325635844 +0200
+@@ -23,6 +23,7 @@
+ #endif
+ 
+ #include <limits.h>
++#include <cstdio>
+ #include "fcgio.h"
+ 
+ using std::streambuf;
diff --git a/recipes/glibmm/glibmm.inc b/recipes/glibmm/glibmm.inc
index c33d3151ae..bb786ff578 100644
--- a/recipes/glibmm/glibmm.inc
+++ b/recipes/glibmm/glibmm.inc
@@ -4,7 +4,6 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "LGPL"
 DEPENDS = "glib-2.0 libsigc++-2.0"
-PR = "r0"
 SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
 
 SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}.tar.bz2"
@@ -12,7 +11,7 @@ SRC_URI = "ftp://ftp.gnome.org/pub/GNOME/sources/glibmm/${SHRT_VER}/glibmm-${PV}
 inherit autotools pkgconfig flow-lossage
 
 FILES_${PN} = "${libdir}/lib*.so.*"
-FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/"
+FILES_${PN}-dev += "${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/"
 
 LIBV = "2.4.0"
 
@@ -20,5 +19,5 @@ do_stage () {
 	autotools_stage_all
 
 	install -m 0644 glib/glibmmconfig.h ${STAGING_INCDIR}/glibmm-2.4
-	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/
+	install -m 0644 scripts/glibmm_check_perl.m4 ${STAGING_DATADIR}/aclocal/ || true
 }
diff --git a/recipes/glibmm/glibmm_2.22.1.bb b/recipes/glibmm/glibmm_2.22.1.bb
new file mode 100644
index 0000000000..d96a372d26
--- /dev/null
+++ b/recipes/glibmm/glibmm_2.22.1.bb
@@ -0,0 +1,9 @@
+require glibmm.inc
+
+do_configure() {
+	libtoolize --force
+	gnu-configize
+	oe_runconf
+}
+
+
diff --git a/recipes/gnome-mplayer/gnome-mplayer.inc b/recipes/gnome-mplayer/gnome-mplayer.inc
index 15808a11b4..74208c5543 100644
--- a/recipes/gnome-mplayer/gnome-mplayer.inc
+++ b/recipes/gnome-mplayer/gnome-mplayer.inc
@@ -6,6 +6,10 @@ LICENSE = "GPL"
 DEPENDS = "gtk+ gconf dbus-glib"
 RDEPENDS = "mplayer"
 
-inherit autotools pkgconfig gconf
+inherit gnome
 
 SRC_URI = "http://gnome-mplayer.googlecode.com/files/${P}.tar.gz"
+
+FILES_${PN} += "${datadir}/icons"
+
+
diff --git a/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
new file mode 100644
index 0000000000..37502adb4e
--- /dev/null
+++ b/recipes/gnome-mplayer/gnome-mplayer_0.9.8.bb
@@ -0,0 +1,3 @@
+require gnome-mplayer.inc
+
+PR = "r6"
diff --git a/recipes/gnome/libsoup-2.4_2.27.91.bb b/recipes/gnome/libsoup-2.4_2.27.91.bb
index ae503065c0..1fce0ff1e3 100644
--- a/recipes/gnome/libsoup-2.4_2.27.91.bb
+++ b/recipes/gnome/libsoup-2.4_2.27.91.bb
@@ -1,7 +1,9 @@
 DESCRIPTION = "An HTTP library implementation in C"
 SECTION = "x11/gnome/libs"
 LICENSE = "GPL"
-DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3"
+DEPENDS = "libproxy glib-2.0 gnutls libxml2 sqlite3 gnome-keyring"
+
+PR = "r1"
 
 inherit gnome
 
diff --git a/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch
new file mode 100644
index 0000000000..1b4cf15c8f
--- /dev/null
+++ b/recipes/gstreamer/gst-plugin-gles/omap3_disable_depth_attachment.patch
@@ -0,0 +1,45 @@
+--- /tmp/gstgldisplay.c	2009-09-28 00:49:48.000000000 +0530
++++ git/gst-libs/gst/gl/gstgldisplay.c	2009-09-28 02:35:00.000000000 +0530
+@@ -1252,12 +1252,12 @@ gst_gl_display_thread_init_download (Gst
+           default:
+             g_assert_not_reached ();
+         }
+-
++#if 0
+         //attach the depth render buffer to the FBO
+         glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT,
+             GL_DEPTH_ATTACHMENT_EXT, GL_RENDERBUFFER_EXT,
+             display->download_depth_buffer);
+-
++#endif
+         gst_gl_display_check_framebuffer_status ();
+ 
+         g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
+@@ -1555,11 +1555,11 @@ gst_gl_display_thread_gen_fbo (GstGLDisp
+   //attach the texture to the FBO to renderer to
+   glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+       GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0);
+-
++#if 0
+   //attach the depth render buffer to the FBO
+   glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+       GL_RENDERBUFFER_EXT, display->generated_depth_buffer);
+-
++#endif
+   g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
+       GL_FRAMEBUFFER_COMPLETE_EXT);
+ 
+@@ -2443,11 +2443,11 @@ gst_gl_display_thread_init_upload_fbo (G
+     //attach the texture to the FBO to renderer to
+     glFramebufferTexture2DEXT (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+         GL_TEXTURE_RECTANGLE_ARB, fake_texture, 0);
+-
++#if 0
+     //attach the depth render buffer to the FBO
+     glFramebufferRenderbufferEXT (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+         GL_RENDERBUFFER_EXT, display->upload_depth_buffer);
+-
++#endif
+     gst_gl_display_check_framebuffer_status ();
+ 
+     g_assert (glCheckFramebufferStatusEXT (GL_FRAMEBUFFER_EXT) ==
diff --git a/recipes/gstreamer/gst-plugin-gles_git.bb b/recipes/gstreamer/gst-plugin-gles_git.bb
new file mode 100644
index 0000000000..68c1241191
--- /dev/null
+++ b/recipes/gstreamer/gst-plugin-gles_git.bb
@@ -0,0 +1,58 @@
+DESCRIPTION = "GStreamer OpenGL/GLES2 plugins"
+LICENSE = "LGPL"
+
+SRCREV = "18f5c4875006606b28aa9aa366abbc5dd1e16b60"
+SRCREV_common = "792d198f3f694e5475d1467b5ae9371a23baf7a3" 
+PR_append = "+gitr${SRCREV}"
+PV = "0.10"
+
+DEPENDS = "virtual/libsdl libgles-omap3 gstreamer gst-plugins-base"
+
+
+SRC_URI = "git://anongit.freedesktop.org/gstreamer/gst-plugins-gl;protocol=git \
+           http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.23.tar.bz2 \
+           file://omap3_disable_depth_attachment.patch;patch=1 \
+"
+
+S = "${WORKDIR}/git"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--disable-tests --disable-examples"
+
+do_configure_prepend () {
+	cp -rf ${WORKDIR}/gstreamer-0.10.23/common/* ${S}/common/
+	cp -rf ${WORKDIR}/gstreamer-0.10.23/po/* ${S}/po/
+	sed -i -e '/po /d' ${S}/Makefile.am
+}
+
+do_configure () {
+	#Hack to force GLES2
+	acl_cv_hardcode_libdir_flag_spec= ac_cv_header_GL_gl_h=no autotools_do_configure
+
+	#Hack to disable Werror (treat warning as errors)
+	for i in $(find "${S}" -name Makefile) ; do
+		sed -i -e 's:-Wl,-rpath-link,${STAGING_LIBDIR}::g' -e s:\Werror\:\Wno-error\:g $i
+	done
+}
+
+GST_LIBV = 0.10
+
+do_install() {
+	install -d ${D}${libdir}/gstreamer-${GST_LIBV}/
+	install -m 0755 gst/gl/.libs/libgstopengl.so ${D}${libdir}/gstreamer-${GST_LIBV}
+	install -m 0755 gst-libs/gst/gl/.libs/libgstgl-0.10.so.0.0.0 ${D}${libdir}/libgstgl-0.10.so.0
+}
+
+
+FILES_${PN} = "${libdir}/gstreamer-0.10/libgstopengl.so \
+               ${libdir}/libgstgl-0.10.so.0"
+
+FILES_${PN}-dev += "\
+  ${libdir}/gstreamer-0.10/libgstopengl.* \
+"
+
+FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
+
+INSANE_SKIP_${PN} = True
+
diff --git a/recipes/gtkmm/gtkmm_2.18.1.bb b/recipes/gtkmm/gtkmm_2.18.1.bb
new file mode 100644
index 0000000000..198fbd4f43
--- /dev/null
+++ b/recipes/gtkmm/gtkmm_2.18.1.bb
@@ -0,0 +1,13 @@
+require gtkmm.inc
+
+DEPENDS += "pangomm"
+
+EXTRA_OECONF = " --disable-documentation "
+
+do_configure() {
+    libtoolize --force
+    gnu-configize
+    oe_runconf
+}
+
+
diff --git a/recipes/jamvm/files/jamvm-1.5.3-jni_h-noinst.patch b/recipes/jamvm/files/jamvm-1.5.3-jni_h-noinst.patch
new file mode 100644
index 0000000000..f0884fd838
--- /dev/null
+++ b/recipes/jamvm/files/jamvm-1.5.3-jni_h-noinst.patch
@@ -0,0 +1,13 @@
+Index: jamvm-1.5.3/src/Makefile.am
+===================================================================
+--- jamvm-1.5.3.orig/src/Makefile.am	2009-09-29 09:29:13.386565473 +0200
++++ jamvm-1.5.3/src/Makefile.am	2009-09-29 09:33:47.702565852 +0200
+@@ -23,7 +23,7 @@
+ DIST_SUBDIRS = os arch interp
+ 
+ bin_PROGRAMS = jamvm
+-include_HEADERS = jni.h
++noinst_HEADERS = jni.h
+ 
+ lib_LTLIBRARIES = libjvm.la
+ noinst_LTLIBRARIES = libcore.la
diff --git a/recipes/jamvm/jamvm-initial_1.4.5.bb b/recipes/jamvm/jamvm-initial_1.4.5.bb
index c71811dd4e..1566deba61 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"
 
-PR = "r0"
+PR = "r1"
 
 PROVIDES = "virtual/java-initial"
 
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
 
 inherit native autotools
 
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
 EXTRA_OECONF = "\
   --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
+  --libdir=${STAGING_LIBDIR}/jamvm-initial \
   "
 
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
 
 do_compile() {
   oe_runmake \
diff --git a/recipes/jamvm/jamvm-initial_1.5.0.bb b/recipes/jamvm/jamvm-initial_1.5.0.bb
index a1c415dd62..1566deba61 100644
--- a/recipes/jamvm/jamvm-initial_1.5.0.bb
+++ b/recipes/jamvm/jamvm-initial_1.5.0.bb
@@ -19,12 +19,16 @@ ARM_INSTRUCTION_SET = "arm"
 
 inherit native autotools
 
+# libdir must be modified so that jamvm-initial and -native
+# do not interfere
 EXTRA_OECONF = "\
   --with-classpath-install-dir=${prefix} \
   --program-suffix=-initial \
+  --libdir=${STAGING_LIBDIR}/jamvm-initial \
   "
 
-CFLAGS += "-DDEFAULT_MAX_HEAP=16*MB"
+# jamvm-initial has to run some binaries which need lots of memory.
+CFLAGS += "-DDEFAULT_MAX_HEAP=512*MB"
 
 do_compile() {
   oe_runmake \
diff --git a/recipes/jamvm/jamvm-native_1.5.3.bb b/recipes/jamvm/jamvm-native_1.5.3.bb
index 07a213c260..bc3cbe9950 100644
--- a/recipes/jamvm/jamvm-native_1.5.3.bb
+++ b/recipes/jamvm/jamvm-native_1.5.3.bb
@@ -2,5 +2,7 @@
 
 require jamvm-native.inc
 
-PR = "r0"
+PR = "r1"
+
+SRC_URI += "file://jamvm-1.5.3-jni_h-noinst.patch;patch=1"
 
diff --git a/recipes/kexec/files/fix-arm-arch-detection.patch b/recipes/kexec/files/fix-arm-arch-detection.patch
index a3676983b5..e581830ff0 100644
--- a/recipes/kexec/files/fix-arm-arch-detection.patch
+++ b/recipes/kexec/files/fix-arm-arch-detection.patch
@@ -1,5 +1,5 @@
---- kexec-tools/kexec/phys_arch.c.old	2008-07-15 02:46:43.000000000 +0200
-+++ kexec-tools/kexec/phys_arch.c	2009-09-25 23:46:04.000000000 +0200
+--- kexec-tools/kexec/phys_arch.c.old	2009-09-25 23:46:04.000000000 +0200
++++ kexec-tools/kexec/phys_arch.c	2009-09-28 22:26:04.000000000 +0200
 @@ -13,9 +13,16 @@
 		return -1;
 	}
@@ -8,7 +8,7 @@
 -		if (strcmp(utsname.machine, arches[i].machine) == 0)
 +	for (i = 0; arches[i].machine; ++i) {
 +
-+		if ((arches[i].machine == "arm") && (strncmp(utsname.machine, arches[i].machine, 3) == 0)) {
++		if ((strcmp(arches[i].machine, "arm") == 0) && (strncmp(utsname.machine, arches[i].machine, 3) == 0)) {
 +			return arches[i].arch;
 +		}
 +
diff --git a/recipes/kexec/files/kexec-tools-2-klibc.patch b/recipes/kexec/files/kexec-tools-2-klibc.patch
index c8b340e4b9..c9faf96cdd 100644
--- a/recipes/kexec/files/kexec-tools-2-klibc.patch
+++ b/recipes/kexec/files/kexec-tools-2-klibc.patch
@@ -140,23 +140,6 @@ Index: kexec-tools-2.0.1/purgatory/string.c
  size_t strnlen(const char *s, size_t max)
  {
 
-Index: kexec-tools-2.0.1/purgatory/purgatory.c
-===================================================================
---- kexec-tools-2.0.1.orig/purgatory/purgatory.c	2009-05-16 13:28:19.000000000 +0200
-+++ kexec-tools-2.0.1/purgatory/purgatory.c	2009-09-16 14:15:21.000000000 +0200
-@@ -3,7 +3,7 @@
- #include <stdint.h>
- #include <purgatory.h>
- #include <sha256.h>
--#include <string.h>
-+/* #include <string.h> */
- #include "../kexec/kexec-sha256.h"
-
- struct sha256_region sha256_regions[SHA256_REGIONS] = {};
-	}
-	sha256_finish(&ctx, digest);
-	if (memcmp(digest, sha256_digest, sizeof(digest)) != 0) {
-
 Index: kexec-tools-2.0.1/kexec/kexec.c
 ===================================================================
 --- kexec-tools-2.0.1.orig/kexec/kexec.c	2008-02-24 14:15:46.950825917 +0100
diff --git a/recipes/lesstif/lesstif_0.95.0.bb b/recipes/lesstif/lesstif_0.95.0.bb
index cb348e70db..5af87e3d41 100644
--- a/recipes/lesstif/lesstif_0.95.0.bb
+++ b/recipes/lesstif/lesstif_0.95.0.bb
@@ -1,7 +1,7 @@
 SECTION = "libs"
 DESCRIPTION = "Free OSM/Motif implementation."
 LICENSE = "LGPL"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
 	${SOURCEFORGE_MIRROR}/lesstif/${BP}.tar.bz2 \
@@ -40,7 +40,7 @@ addtask preconfigure after do_patch before do_configure
 EXTRA_OECONF = "\
 	--with-gnu-ld --disable-verbose --disable-build-12 --disable-build-20 \
 	--enable-build-21 --enable-xrender --enable-production --without-motif \
-	--x-includes=. \
+	--x-includes=. --x-libraries=. \
 "
 
 PACKAGES += "${PN}-bin"
diff --git a/recipes/linux/linux-omap/ehci.patch b/recipes/linux/linux-omap/ehci.patch
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/recipes/linux/linux-omap/ehci.patch
diff --git a/recipes/linux/linux-omap/fix-omap4.diff b/recipes/linux/linux-omap/fix-omap4.diff
new file mode 100644
index 0000000000..5f8ffbce1d
--- /dev/null
+++ b/recipes/linux/linux-omap/fix-omap4.diff
@@ -0,0 +1,63 @@
+From: Tony Lindgren <tony@atomide.com>
+Date: Thu, 24 Sep 2009 23:23:07 +0000 (-0700)
+Subject: omap: Fix 44xx compile
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftmlind%2Flinux-omap-2.6.git;a=commitdiff_plain;h=61f04ee83c768c556168b09d71f0dc87b4a6090a
+
+omap: Fix 44xx compile
+
+Looks like these patches were not tested that well..
+
+Signed-off-by: Tony Lindgren <tony@atomide.com>
+---
+
+diff --git a/arch/arm/mach-omap2/cm4xxx.c b/arch/arm/mach-omap2/cm4xxx.c
+index e4ebd6d..4af76bb 100644
+--- a/arch/arm/mach-omap2/cm4xxx.c
++++ b/arch/arm/mach-omap2/cm4xxx.c
+@@ -22,7 +22,6 @@
+ #include <asm/atomic.h>
+ 
+ #include "cm.h"
+-#include "cm-regbits-4xxx.h"
+ 
+ /* XXX move this to cm.h */
+ /* MAX_MODULE_READY_TIME: max milliseconds for module to leave idle */
+@@ -50,19 +49,7 @@
+  */
+ int omap4_cm_wait_idlest_ready(u32 prcm_mod, u8 prcm_dev_offs)
+ {
+-	int i = 0;
+-	u8 cm_id;
+-	u16 prcm_mod_offs;
+-	u32 mask = OMAP4_PRCM_CM_CLKCTRL_IDLEST_MASK;
+-
+-	cm_id = prcm_mod >> OMAP4_PRCM_MOD_CM_ID_SHIFT;
+-	prcm_mod_offs = prcm_mod & OMAP4_PRCM_MOD_OFFS_MASK;
+-
+-	while (((omap4_cm_read_mod_reg(cm_id, prcm_mod_offs, prcm_dev_offs,
+-				       OMAP4_CM_CLKCTRL_DREG) & mask) != 0) &&
+-	       (i++ < MAX_MODULE_READY_TIME))
+-		udelay(1);
+-
+-	return (i < MAX_MODULE_READY_TIME) ? 0 : -EBUSY;
++	/* FIXME: Add clock manager related code */
++	return 0;
+ }
+ 
+diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
+index 7574b6f..e3a3bad 100644
+--- a/arch/arm/mach-omap2/io.c
++++ b/arch/arm/mach-omap2/io.c
+@@ -294,10 +294,10 @@ void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,
+ 	else if (cpu_is_omap34xx())
+ 		hwmods = omap34xx_hwmods;
+ 
+-	omap_hwmod_init(hwmods);
+-	omap2_mux_init();
+ #ifndef CONFIG_ARCH_OMAP4 /* FIXME: Remove this once the clkdev is ready */
+ 	/* The OPP tables have to be registered before a clk init */
++	omap_hwmod_init(hwmods);
++	omap2_mux_init();
+ 	omap_pm_if_early_init(mpu_opps, dsp_opps, l3_opps);
+ 	pwrdm_init(powerdomains_omap);
+ 	clkdm_init(clockdomains_omap, clkdm_pwrdm_autodeps);
diff --git a/recipes/linux/linux-omap/fix-serial.eml b/recipes/linux/linux-omap/fix-serial.eml
new file mode 100644
index 0000000000..25c5923068
--- /dev/null
+++ b/recipes/linux/linux-omap/fix-serial.eml
@@ -0,0 +1,95 @@
+From: "Shilimkar, Santosh" <santosh.shilimkar@ti.com>
+
+Tony,
+OMAP4430 board build is breaking on the latest mainline head because of couple of issues.
+1. The serial.c merge conflict issue below wasn't fixed correctly :(
+Related link:
+http://article.gmane.org/gmane.linux.ports.arm.omap/23341
+
+2. Pauls below series breaks build as well. 
+[PATCH 00/13] OMAP PM, clock,	and SDRC updates for the 2.6.32 merge window
+
+
+Paul,
+Can you fix the same please? I don't have the correct " cm-regbits-4xxx.h" file to generate the patch. 
+
+***************************************************
+CC      arch/arm/mach-omap2/control.o
+  CC      arch/arm/mach-omap2/mux.o
+  CC      arch/arm/mach-omap2/devices.o
+  CC      arch/arm/mach-omap2/serial.o
+  CC      arch/arm/mach-omap2/gpmc.o
+  CC      arch/arm/mach-omap2/timer-gp.o
+  CC      arch/arm/mach-omap2/omap-smp.o
+  AS      arch/arm/mach-omap2/omap-headsmp.o
+  CC      arch/arm/mach-omap2/timer-mpu.o
+  CC      arch/arm/mach-omap2/cm4xxx.o
+arch/arm/mach-omap2/cm4xxx.c:25:29: error: cm-regbits-4xxx.h: No such file or directory
+arch/arm/mach-omap2/cm4xxx.c: In function 'omap4_cm_wait_idlest_ready':
+arch/arm/mach-omap2/cm4xxx.c:61: error: implicit declaration of function 'omap4_cm_read_mod_reg'
+arch/arm/mach-omap2/cm4xxx.c:62: error: 'OMAP4_CM_CLKCTRL_DREG' undeclared (first use in this function)
+arch/arm/mach-omap2/cm4xxx.c:62: error: (Each undeclared identifier is reported only once
+arch/arm/mach-omap2/cm4xxx.c:62: error: for each function it appears in.)