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

7 files changed, 75 insertions, 31 deletions

diff --git a/recipes/batmand/batmand-0.3.2/makefile-fix.patch b/recipes/batmand/batmand-0.3.2/makefile-fix.patch
new file mode 100644
index 0000000000..9e74a91471
--- /dev/null
+++ b/recipes/batmand/batmand-0.3.2/makefile-fix.patch
@@ -0,0 +1,13 @@
+Index: batman-0.3.2/Makefile
+===================================================================
+--- batman-0.3.2.orig/Makefile	2009-05-15 21:41:16.000000000 +0200
++++ batman-0.3.2/Makefile	2009-09-22 16:20:05.937937168 +0200
+@@ -28,8 +28,6 @@
+ # activate this variable to deactivate policy routing for backward compatibility
+ #NO_POLICY_ROUTING = -DNO_POLICY_ROUTING
+ 
+-CC =		gcc
+-CFLAGS +=	-pedantic -Wall -W -O1 -g3 -std=gnu99
+ EXTRA_CFLAGS =	-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA $(NO_POLICY_ROUTING) -DREVISION_VERSION=$(REVISION_VERSION)
+ LDFLAGS +=	-lpthread
+ 
diff --git a/recipes/batmand/batmand.inc b/recipes/batmand/batmand.inc
new file mode 100644
index 0000000000..cb99cf0d74
--- /dev/null
+++ b/recipes/batmand/batmand.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Routing protocol daemon for multi-hop ad-hoc mesh networks."
+SECTION = "console/network"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.open-mesh.net/"
+
+INC_PR = "r1"
+
+RDEPENDS = "kernel-module-tun"
+
+SRC_URI = "http://downloads.open-mesh.net/batman/stable/sources/batman/batman-${PV}.tar.gz \
+           file://makefile-fix.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/batman-${PV}"
+
+do_compile() {
+  oe_runmake
+}
+
+do_stage() {
+  :
+}
+
+do_install() {
+  install -d ${D}${bindir}
+  install -m 0755 batmand ${D}${bindir}
+}
diff --git a/recipes/batmand/batmand_0.3.2.bb b/recipes/batmand/batmand_0.3.2.bb
new file mode 100644
index 0000000000..f359f5e7ca
--- /dev/null
+++ b/recipes/batmand/batmand_0.3.2.bb
@@ -0,0 +1,3 @@
+require batmand.inc
+PR = "${INC_PR}.1"
+
diff --git a/recipes/batmand/batmand_0.3.bb b/recipes/batmand/batmand_0.3.bb
index c78f94d5e3..f359f5e7ca 100644
--- a/recipes/batmand/batmand_0.3.bb
+++ b/recipes/batmand/batmand_0.3.bb
@@ -1,29 +1,3 @@
-DESCRIPTION = "Routing protocol daemon for multi-hop ad-hoc mesh networks."
-SECTION = "console/network"
-PRIORITY = "optional"
-LICENSE = "GPL"
-HOMEPAGE = "https://www.open-mesh.net/batman"
+require batmand.inc
+PR = "${INC_PR}.1"
 
-PR = "r0"
-
-RDEPENDS = "kernel-module-tun"
-
-SRC_URI = "\
-  http://downloads.open-mesh.net/batman/stable/sources/batman-0.3.tar.gz \
-  file://makefile-fix.patch;patch=1 \
-  "
-
-S = "${WORKDIR}/batman-${PV}"
-
-do_compile() {
-  oe_runmake
-}
-
-do_stage() {
-  :
-}
-
-do_install() {
-  install -d ${D}${bindir}
-  install -m 0755 batmand ${D}${bindir}
-}
diff --git a/recipes/linux/linux-omap-zoomsync_2.6.31.bb b/recipes/linux/linux-omap-zoomsync_2.6.31.bb
index 63f9462633..04490af6dd 100644
--- a/recipes/linux/linux-omap-zoomsync_2.6.31.bb
+++ b/recipes/linux/linux-omap-zoomsync_2.6.31.bb
@@ -8,13 +8,17 @@ COMPATIBLE_MACHINE = "omapzoom2"
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_omapzoom2 = "1"
 
-SRCREV = "3823238fe2e56f60b9c6c085d3f1cfa720ae89b8"
+LOBRANCH?= "master"
+
+SRCREV = "02b2ce47a93e32f3b4e26662d78a0f31a6ac37ab"
+OEV = "oe1"
+PE = "1"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
-PV = "2.6.30+2.6.31-rc7"
+PV = "2.6.30+2.6.31-rc7-${OEV}"
 PR_append = "+gitr${SRCREV}"
 
-SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=lo-sync-v2.6.31-rc7-7a8d53a0;protocol=git \
+SRC_URI = "git://dev.omapzoom.org/pub/scm/integration/kernel-omap3.git;branch=${LOBRANCH};protocol=git \
 	   file://defconfig"
 
 SRC_URI_append = " \
diff --git a/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch b/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
new file mode 100644
index 0000000000..831b3edd4d
--- /dev/null
+++ b/recipes/powervr-drivers/omap3-sgx-modules/proc-interface.patch
@@ -0,0 +1,20 @@
+Index: omap3-sgx-modules-1.3.13.1607/services4/srvkm/env/linux/proc.c
+===================================================================
+--- omap3-sgx-modules-1.3.13.1607.orig/services4/srvkm/env/linux/proc.c
++++ omap3-sgx-modules-1.3.13.1607/services4/srvkm/env/linux/proc.c
+@@ -134,7 +134,6 @@ int CreateProcEntry(const char * name, r
+ 
+     if (file)
+     {
+-        file->owner = THIS_MODULE;
+ 		file->read_proc = rhandler;
+ 		file->write_proc = whandler;
+ 		file->data = data;
+@@ -165,7 +164,6 @@ int CreateProcReadEntry(const char * nam
+ 
+     if (file)
+     {
+-        file->owner = THIS_MODULE;
+ 
+         return 0;
+     }
diff --git a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
index 8e4d2a25bd..c58c25c092 100644
--- a/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
+++ b/recipes/powervr-drivers/omap3-sgx-modules_1.3.13.1607.bb
@@ -9,6 +9,8 @@ SRC_URI = "file://omap3-sgx-modules-${PV}.tar.bz2 \
            file://build_es3.x_sgx.patch;patch=1 \
 "
 
+SRC_URI_append_omapzoom2 = " file://proc-interface.patch;patch=1"
+
 PVRBUILD = "release"
 
 MAKE_TARGETS = " BUILD=${PVRBUILD}"