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

41 files changed, 545 insertions, 76 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 2a0cd1e6e4..211e40c992 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -246,6 +246,7 @@ Recipes:    directfb, php
 Person:     Steffen Sledz
 Mail:       sledz@dresearch.de
 Machines:   oxnas
+Recipes:    forte
 
 Person:     Stelios Koroneos
 Mail:       skoroneos@digital-opsis.com
diff --git a/classes/base.bbclass b/classes/base.bbclass
index 411adc95d0..18afc1a2fe 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -873,8 +873,12 @@ python base_eventhandler() {
 		msg += messages.get(name[5:]) or name[5:]
 	elif name == "UnsatisfiedDep":
 		msg += "package %s: dependency %s %s" % (e.pkg, e.dep, name[:-3].lower())
-	if msg:
-		note(msg)
+
+	# Only need to output when using 1.8 or lower, the UI code handles it
+	# otherwise
+	if (int(bb.__version__.split(".")[0]) <= 1 and int(bb.__version__.split(".")[1]) <= 8):
+		if msg:
+			note(msg)
 
 	if name.startswith("BuildStarted"):
 		bb.data.setVar( 'BB_VERSION', bb.__version__, e.data )
diff --git a/classes/failure-cleanup.bbclass b/classes/failure-cleanup.bbclass
new file mode 100644
index 0000000000..3870c756c8
--- /dev/null
+++ b/classes/failure-cleanup.bbclass
@@ -0,0 +1,18 @@
+# This class clean a package on failure, a nice way to keep diskspace usage down and force rebuilds
+
+# we want to be an event handler
+addhandler failure_eventhandler
+python failure_eventhandler() {
+    from bb import build, event, note, error, data
+    from bb.event import NotHandled, getName
+
+    if e.data is None or getName(e) == "MsgNote":
+        return NotHandled
+
+    name = getName(e)
+    if name == "PkgFailed":
+       bb.note("Exectuting -c clean on failed build")
+       build.exec_func('do_clean', e.data)
+
+    return NotHandled
+}
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ebd6a6e8f5..9426451553 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -258,6 +258,10 @@ sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0
 md5=a8cf945d09c6458cb27228218e9a2f45
 sha256=8416e162d6fc921f14a61c8905e9f9a28dc25e67e1c71b75574360a13f0c28c7
 
+[http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip]
+md5=d207d3b389ee9f2702df095681459f99
+sha256=2b87b331e931db2db07408c1b07bdb557227e0c16f8fe37f72e40b08fca0a09c
+
 [http://downloads.sourceforge.net/fnorb/Fnorb-1.3.tar.gz]
 md5=7de1500c7ef6592a603890b45e23261b
 sha256=d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294
@@ -5986,6 +5990,10 @@ sha256=3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594
 md5=89b65e010acaa3c5d370e1cc0ea9fce9
 sha256=77fb4d23dfa8c12d69ccfda71f482af9804132fab800610970cd5fe9944a3016
 
+[http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip]
+md5=2d01a3d3b9b16bf646e6bb89cb9b0faf
+sha256=c3a61174f6a69252983a9b26ea87005bcab6a72b0bd34ea693e3de89e70eaea6
+
 [ftp://ftp.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1-2.diff.gz]
 md5=5f059f7c997adbc0a260f27947605be1
 sha256=d68c7c8ff6fe94341a3a73d22ab976da42921e3bec9bed628a428518c2c5f67a
@@ -14954,6 +14962,10 @@ sha256=7861535eef2c0804dbdc6993db76574b4a812164bed7545a3697a3b97e36d2dd
 md5=5169ead6783f374cedf3f89bf399bd75
 sha256=a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
 
+[http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
+md5=24f6c176246300b66c036de65fed0565
+sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
+
 [http://downloads.sourceforge.net/midpath/midpath-0.3rc2.tar.gz]
 md5=d03cd88f51f82bbcfcfa5b65df0da5b0
 sha256=e235ca7470e7cdfb90e3806fbcc1b2c450db286276136a2523c7ae26a804a100
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index a701bac1c1..f241d7c005 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -116,6 +116,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
+SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-gta03.conf
index 3bbb21e5e6..f135178652 100644
--- a/conf/machine/om-gta03.conf
+++ b/conf/machine/om-gta03.conf
@@ -6,7 +6,7 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
diff --git a/packages/e17/entrance/allow-missing-xsession.patch b/packages/e17/entrance/allow-missing-xsession.patch
index 74289ad3c8..e0ebe6e0e9 100644
--- a/packages/e17/entrance/allow-missing-xsession.patch
+++ b/packages/e17/entrance/allow-missing-xsession.patch
@@ -1,8 +1,8 @@
-Index: entrance-0.9.0.009/configure.in
+Index: entrance/configure.ac
 ===================================================================
---- entrance-0.9.0.009.orig/configure.in
-+++ entrance-0.9.0.009/configure.in
-@@ -184,10 +184,10 @@ AC_ARG_WITH(xsession,
+--- entrance.orig/configure.ac	2009-02-17 10:59:20.000000000 +0000
++++ entrance/configure.ac	2009-02-17 13:09:51.000000000 +0000
+@@ -198,10 +198,10 @@
  	    fi
  	]
  )
diff --git a/packages/e17/entrance/config-db.patch b/packages/e17/entrance/config-db.patch
index aecbfb6867..89e18ccff4 100644
--- a/packages/e17/entrance/config-db.patch
+++ b/packages/e17/entrance/config-db.patch
@@ -1,7 +1,7 @@
-Index: entrance-0.9.0.009/data/config/build_config.sh.in
+Index: entrance/data/config/build_config.sh.in
 ===================================================================
---- entrance-0.9.0.009.orig/data/config/build_config.sh.in
-+++ entrance-0.9.0.009/data/config/build_config.sh.in
+--- entrance.orig/data/config/build_config.sh.in	2009-02-17 10:59:01.000000000 +0000
++++ entrance/data/config/build_config.sh.in	2009-02-17 13:45:06.000000000 +0000
 @@ -1,45 +1,45 @@
  #!/bin/sh -e
  
@@ -24,7 +24,26 @@ Index: entrance-0.9.0.009/data/config/build_config.sh.in
 -}
 -
 -SESSION_DIR=""
--DB="./entrance_config.cfg"
++#usage() {
++#	cat <<-EOF
++#	Usage: $0 [options]
++#
++#	Options:
++#	  -d, --dir     Session directory to scan
++#	  -c, --file    Config file (default: $DB)
++#	  -h, --help    This help output :p
++#	EOF
++#
++#	if [ "$1" = "1" ] ; then
++#		echo ""
++#		echo "ERROR: $2"
++#	fi
++#
++#	exit $1
++#}
++#
++#SESSION_DIR=""
+ DB="./entrance_config.cfg"
 -
 -while [ -n "$1" ] ; do
 -	case $1 in
@@ -45,26 +64,6 @@ Index: entrance-0.9.0.009/data/config/build_config.sh.in
 -	FROM="defaults"
 -fi
 -echo "Generating config file '$DB' from '$FROM' ..."
-+#usage() {
-+#	cat <<-EOF
-+#	Usage: $0 [options]
-+#
-+#	Options:
-+#	  -d, --dir     Session directory to scan
-+#	  -c, --file    Config file (default: $DB)
-+#	  -h, --help    This help output :p
-+#	EOF
-+#
-+#	if [ "$1" = "1" ] ; then
-+#		echo ""
-+#		echo "ERROR: $2"
-+#	fi
-+#
-+#	exit $1
-+#}
-+#
-+#SESSION_DIR=""
-+#DB="./entrance_config.cfg"
 +#
 +#while [ -n "$1" ] ; do
 +#	case $1 in
@@ -84,11 +83,11 @@ Index: entrance-0.9.0.009/data/config/build_config.sh.in
 +#if [ -z "$FROM" ] ; then
 +#	FROM="defaults"
 +#fi
-+#echo "Generating config file '$DB' from '$FROM' ..."
++echo "Generating config file '$DB' ..."
  
  rm -f $DB || exit 1
  
-@@ -59,10 +59,10 @@ ecore_config -c $DB -k /entrance/time_fo
+@@ -59,10 +59,10 @@
  #ecore_config -c $DB -k /entrance/fonts/0/-s -s "/usr/share/fonts/truetype/"
  #ecore_config -c $DB -k /entrance/fonts/1/-s -s "/usr/X11R6/lib/X11/fonts/Truetype/"
  ecore_config -c $DB -k /entrance/greeting/before -s "Welcome to"
@@ -101,7 +100,7 @@ Index: entrance-0.9.0.009/data/config/build_config.sh.in
  ecore_config -c $DB -k /entrance/session/0/title -s "Default"
  ecore_config -c $DB -k /entrance/session/0/icon -s "default.png"
  #if [ -z "$SESSION_DIR" ] ; then
-@@ -92,7 +92,7 @@ ecore_config -c $DB -k /entrance/session
+@@ -92,7 +92,7 @@
  #	done
  #fi
  count=`(expr $count + 1)`
@@ -110,10 +109,10 @@ Index: entrance-0.9.0.009/data/config/build_config.sh.in
  ecore_config -c $DB -k /entrance/session/$count/title -s "Failsafe"
  ecore_config -c $DB -k /entrance/session/$count/icon -s "failsafe.png"
  count=`(expr $count + 1)`
-@@ -107,5 +107,5 @@ ecore_config -c $DB -k /entrance/autolog
+@@ -107,5 +107,5 @@
  ecore_config -c $DB -k /entrance/presel/mode -i 1
  
  # for Entranced
--ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -nolisten tcp@ENTRANCE_VT_ARG@"
+-ecore_config -c $DB -k /entranced/xserver -s "@xbin@/X -quiet -br -nolisten tcp@ENTRANCE_VT_ARG@"
 +ecore_config -c $DB -k /entranced/xserver -s "/etc/X11/Xserver"
  ecore_config -c $DB -k /entranced/attempts -i 5
diff --git a/packages/e17/entrance_0.9.0.010.bb b/packages/e17/entrance_0.9.0.010.bb
index a1ffe80023..f9dd5e49ce 100644
--- a/packages/e17/entrance_0.9.0.010.bb
+++ b/packages/e17/entrance_0.9.0.010.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT BSD"
 # can also use pam and crypt
 DEPENDS = "evas ecore edje esmart bash keylaunch xserver-common login-manager"
 RDEPENDS += "glibc-gconv-iso8859-1 entrance-themes"
-PR = "r1"
+PR = "r2"
 
 inherit e
 
@@ -15,7 +15,7 @@ SRC_URI += "\
            file://use-bash.patch;patch=1 \
            file://Sessions"
 
-S = "${WORKDIR}/entrance-${PV}"
+S = "${WORKDIR}/entrance"
 
 EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
                 --with-xsession=/etc/X11/Xsession \
diff --git a/packages/efl1/ecore-native_svn.bb b/packages/efl1/ecore-native_svn.bb
index 2fc383b367..22208b926e 100644
--- a/packages/efl1/ecore-native_svn.bb
+++ b/packages/efl1/ecore-native_svn.bb
@@ -1,11 +1,11 @@
 require ecore.inc
 inherit native
 DEPENDS = "eet-native evas-native"
-PR = "r2"
+PR = "r3"
 
 EXTRA_OECONF = "\
                 --enable-ecore-txt \
-                --disable-ecore-config \
+                --enable-ecore-config \
                 --disable-ecore-x-xcb \
                 --disable-ecore-x \
                 --enable-ecore-job \
diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch b/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch
new file mode 100644
index 0000000000..a3dcd10917
--- /dev/null
+++ b/packages/forte/forte-0.3.5/forte-0.3.5_socket_reuse.patch
@@ -0,0 +1,20 @@
+diff -Naur FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp FORTE-0.3.5/src/arch/pc/pcsochan.cpp
+--- FORTE-0.3.5.orig/src/arch/pc/pcsochan.cpp	2009-01-13 16:17:18.000000000 +0000
++++ FORTE-0.3.5/src/arch/pc/pcsochan.cpp	2009-02-16 10:08:53.000000000 +0000
+@@ -128,6 +128,16 @@
+   }

+   // switch between client/server:

+   if (pa_stConnectionInformation.m_enServiceType == e_Server) {

++    unsigned int opt = 1;

++

++    if (setsockopt(sock_id, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) != 0)

++    {

++      char acError[80] = { "TCP-Socket setsockopt() failed: " };

++      strcat(acError, strerror(errno));

++      DEVLOG_ERROR(cg_nID_CSocketHandler, 0x10, acError);

++      return -1;

++    }

++

+     sock_addr.sin_addr.s_addr = htonl(INADDR_ANY);

+     if (bind(sock_id, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr)) != 0) {

+       DEVLOG_ERROR_2(cg_nID_CSocketHandler, 0x02, "TCP-Socket bind() failed: %s", strerror(errno) );

diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch b/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch
new file mode 100644
index 0000000000..3ebd47325a
--- /dev/null
+++ b/packages/forte/forte-0.3.5/forte-0.3.5_stdlib_inc_fix.patch
@@ -0,0 +1,22 @@
+diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp
+--- FORTE-0.3.5.orig/src/core/datatypes/forte_lreal.cpp	2008-12-11 16:05:26.000000000 +0000
++++ FORTE-0.3.5/src/core/datatypes/forte_lreal.cpp	2009-02-16 11:01:44.000000000 +0000
+@@ -8,6 +8,7 @@
+  * Contributors:

+  *     <date>: <author>, <author email> - changes

+  *******************************************************************************/

++#include <stdlib.h>

+ #include <math.h>

+ #include "forte_lreal.h"

+ 

+diff -Naur FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp FORTE-0.3.5/src/core/datatypes/forte_real.cpp
+--- FORTE-0.3.5.orig/src/core/datatypes/forte_real.cpp	2008-12-11 16:05:40.000000000 +0000
++++ FORTE-0.3.5/src/core/datatypes/forte_real.cpp	2009-02-16 11:12:16.000000000 +0000
+@@ -8,6 +8,7 @@
+  * Contributors:

+  *     <date>: <author>, <author email> - changes

+  *******************************************************************************/

++#include <stdlib.h>

+ #include <math.h>

+ #include "forte_real.h"

+ 

diff --git a/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch b/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch
new file mode 100644
index 0000000000..2064cda581
--- /dev/null
+++ b/packages/forte/forte-0.3.5/forte-0.3.5_timer.patch
@@ -0,0 +1,48 @@
+diff -Naur FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp FORTE-0.3.5/src/arch/pc/pctimeha.cpp
+--- FORTE-0.3.5.orig/src/arch/pc/pctimeha.cpp	2009-01-13 16:17:18.000000000 +0000
++++ FORTE-0.3.5/src/arch/pc/pctimeha.cpp	2009-02-16 10:16:37.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include "pctimeha.h"

+ #include "../../core/devexec.h"

+ #include <time.h>

++#include <sys/time.h>

+ 

+ const TINT32 CPCTimerHandler::csm_nTicksPerSecond = 1000;

+ 

+@@ -28,14 +29,34 @@
+   disableHandler();

+ }

+ 

++static inline unsigned long long GetTicks(struct timeval* stTmVal, TINT32 ticksPerSecond)

++{

++  unsigned long long ret = stTmVal->tv_sec * 1000LL;// sec -> ms

++  ret += stTmVal->tv_usec/1000;// + us -> ms

++  ret /= 1000/ticksPerSecond; // ms -> ticks

++  return ret;

++}

++

+ bool CPCTimerHandler::run(){

+   struct timespec stReq;

++  struct timeval stTmNow;

++  unsigned long long tickStart;

++  unsigned long long tickNow;

++  unsigned long long tickCalled = 0;

+   stReq.tv_sec = 0;

+-  stReq.tv_nsec = 1000000 / (csm_nTicksPerSecond / 1000);

++  stReq.tv_nsec = 1000000000 / (csm_nTicksPerSecond);

++

++  gettimeofday(&stTmNow, NULL);

++  tickNow = tickStart = GetTicks(&stTmNow, csm_nTicksPerSecond);

+   

+   while(m_bAlive){

+-    nanosleep(&stReq, NULL);

++    if( (tickNow-tickStart) <= (tickCalled+1) ) {

++      nanosleep(&stReq, NULL);

++    }

+     nextTick(); 

++    ++tickCalled;

++    gettimeofday(&stTmNow, NULL);

++    tickNow = GetTicks(&stTmNow, csm_nTicksPerSecond);

+   } 

+   return true;

+ }

diff --git a/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff b/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff
new file mode 100644
index 0000000000..8478e5f531
--- /dev/null
+++ b/packages/forte/forte-0.3/forte-0.3-patch_20081008.diff
@@ -0,0 +1,109 @@
+diff -Naur forte-0.3.orig/src/arch/netos/txsocha.cpp forte-0.3/src/arch/netos/txsocha.cpp
+--- forte-0.3.orig/src/arch/netos/txsocha.cpp	2008-07-10 07:33:44.000000000 +0000
++++ forte-0.3/src/arch/netos/txsocha.cpp	2008-09-24 13:29:32.000000000 +0000
+@@ -167,7 +167,7 @@
+   strcpy(ip, pa_stConnectionInformation.m_pcConnectionID);

+   sock_addr.sin_family = AF_INET;

+   sock_addr.sin_port = htons(atoi(splitString(ip)));

+-  memset(&(sock_addr.sin_zero), '\0', 8);

++  memset(&(sock_addr.sin_zero), '\0', sizeof(sock_addr.sin_zero));

+   fprintf(stderr,"CTXSocketHandler:: Opening TCP-Connection at IP: %s\n",pa_stConnectionInformation.m_pcConnectionID);

+ 

+   if ((sock_id = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {

+diff -Naur forte-0.3.orig/src/arch/pc/pcsochan.cpp forte-0.3/src/arch/pc/pcsochan.cpp
+--- forte-0.3.orig/src/arch/pc/pcsochan.cpp	2008-07-10 07:33:44.000000000 +0000
++++ forte-0.3/src/arch/pc/pcsochan.cpp	2008-09-30 10:23:36.000000000 +0000
+@@ -116,9 +116,9 @@
+   strcpy(ip, pa_stConnectionInformation.m_pcConnectionID);

+   sock_addr.sin_family = AF_INET;

+   sock_addr.sin_port = htons(atoi(splitString(ip)));

+-  memset(&(sock_addr.sin_zero), '\0', 8);

++  memset(&(sock_addr.sin_zero), '\0', sizeof(sock_addr.sin_zero));

+ 

+-  char acInfo[64] = { "CPCSocketHandler:: Opening TCP-Connection at IP: " };

++  char acInfo[128] = { "CPCSocketHandler:: Opening TCP-Connection at IP: " };

+   strcat(acInfo, pa_stConnectionInformation.m_pcConnectionID);

+   DEVLOG_INFO(cg_nID_CSocketHandler, 0x10, acInfo);

+ 

+@@ -130,6 +130,16 @@
+   }

+   // switch between client/server:

+   if (pa_stConnectionInformation.m_enServiceType == e_Server) {

++    unsigned int opt = 1;

++

++    if (setsockopt(sock_id, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)) != 0)

++    {

++      char acError[80] = { "TCP-Socket setsockopt() failed: " };

++      strcat(acError, strerror(errno));

++      DEVLOG_ERROR(cg_nID_CSocketHandler, 0x10, acError);

++      return -1;

++    }

++

+     sock_addr.sin_addr.s_addr = htonl(INADDR_ANY);

+     if (bind(sock_id, (struct sockaddr *)&sock_addr, sizeof(struct sockaddr))

+         != 0) {

+@@ -191,8 +201,15 @@
+ int CPCSocketHandler::receiveDataOnTCP(SSocketHandlerListEntry &pa_stData) {

+   DEVLOG_INFO(cg_nID_CSocketHandler, 0x10, "CPCSocketHandler:: Entering ReceiveDataOnTCP\n");

+ 

++  int sock_id;

++

++  if (pa_stData.m_bAcceptedConnection)

++    sock_id = pa_stData.m_nAcceptID;

++  else

++    sock_id = pa_stData.m_nSocketID;

++

+   receveagain: pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nFilledSize

+-      =recv(pa_stData.m_nAcceptID, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_pcData, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nMaxSize, 0);

++      =recv(sock_id, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_pcData, pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nMaxSize, 0);

+ 

+   if (pa_stData.m_stConnectionInformation.m_pstRecvBuffer->m_nFilledSize == -1) {

+     if (errno == EINTR) {

+diff -Naur forte-0.3.orig/src/arch/pc/pctimeha.cpp forte-0.3/src/arch/pc/pctimeha.cpp
+--- forte-0.3.orig/src/arch/pc/pctimeha.cpp	2008-04-22 13:31:52.000000000 +0000
++++ forte-0.3/src/arch/pc/pctimeha.cpp	2008-10-08 12:27:09.000000000 +0000
+@@ -11,6 +11,7 @@
+ #include "pctimeha.h"

+ #include "../../core/devexec.h"

+ #include <time.h>

++#include <sys/time.h>

+ 

+ const TINT32 CPCTimerHandler::csm_nTicksPerSecond = 1000;

+ 

+@@ -28,14 +29,34 @@
+   disableHandler();

+ }

+ 

++static inline unsigned long long GetTicks(struct timeval* stTmVal, TINT32 ticksPerSecond)

++{

++  unsigned long long ret = stTmVal->tv_sec * 1000LL;// sec -> ms

++  ret += stTmVal->tv_usec/1000;// + us -> ms

++  ret /= 1000/ticksPerSecond; // ms -> ticks

++  return ret;

++}

++

+ bool CPCTimerHandler::run(){

+   struct timespec stReq;

++  struct timeval stTmNow;

++  unsigned long long tickStart;

++  unsigned long long tickNow;

++  unsigned long long tickCalled = 0;

+   stReq.tv_sec = 0;

+-  stReq.tv_nsec = 1000000 / (csm_nTicksPerSecond / 1000);

++  stReq.tv_nsec = 1000000000 / (csm_nTicksPerSecond);

++

++  gettimeofday(&stTmNow, NULL);

++  tickNow = tickStart = GetTicks(&stTmNow, csm_nTicksPerSecond);

+   

+   while(m_bAlive){

+-    nanosleep(&stReq, NULL);

++    if( (tickNow-tickStart) <= (tickCalled+1) ) {

++      nanosleep(&stReq, NULL);

++    }

+     nextTick(); 

++    ++tickCalled;

++    gettimeofday(&stTmNow, NULL);

++    tickNow = GetTicks(&stTmNow, csm_nTicksPerSecond);

+   } 

+   return true;

+ }

diff --git a/packages/forte/forte.inc b/packages/forte/forte.inc
new file mode 100644
index 0000000000..fa97055729
--- /dev/null
+++ b/packages/forte/forte.inc
@@ -0,0 +1,15 @@
+DESCRIPTION = "4DIAC-RTE (FORTE) is a small portable implementation of an IEC 61499 runtime environment"
+HOMEPAGE = "http://www.fordiac.org/8.0.html"
+SECTION = "console/network"
+DEPENDS = ""
+RDEPENDS = ""
+LICENSE = "EPL"
+
+inherit autotools
+
+EXTRA_OEMAKE = 'LIBS+="-lpthread" CXXFLAGS+="-O0 -g" CPPFLAGS+="-DLOGDEBUG -I${S}/src/core -I${S}/src/core/datatypes -I${S}/src/fblib/events -I${S}/src/fblib/ita -I${S}/src/fblib/math -I${S}/src/fblib/net"'
+
+do_configure_prepend() {
+	chmod +x ${S}/configure
+	ln -s -f ${S}/src/arch/pc ${S}/src/arch/active_arch
+}
diff --git a/packages/forte/forte_0.3.5.bb b/packages/forte/forte_0.3.5.bb
new file mode 100644
index 0000000000..7aeeb8e42e
--- /dev/null
+++ b/packages/forte/forte_0.3.5.bb
@@ -0,0 +1,10 @@
+require forte.inc
+
+PR = "r0"
+
+SRC_URI = "http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip \
+	file://forte-0.3.5_socket_reuse.patch;patch=1 \
+	file://forte-0.3.5_timer.patch;patch=1 \
+	file://forte-0.3.5_stdlib_inc_fix.patch;patch=1"
+
+S="${WORKDIR}/FORTE-${PV}"
diff --git a/packages/forte/forte_0.3.bb b/packages/forte/forte_0.3.bb
new file mode 100644
index 0000000000..c434fb39b8
--- /dev/null
+++ b/packages/forte/forte_0.3.bb
@@ -0,0 +1,10 @@
+require forte.inc
+
+PR = "r0"
+
+DEFAULT_PREFERENCE_oxnas = "1"
+
+SRC_URI = "http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip \
+	file://forte-0.3-patch_20081008.diff;patch=1"
+
+S="${WORKDIR}/forte-${PV}"
diff --git a/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf b/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
new file mode 100644
index 0000000000..d48bc0815c
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/om-gta03/frameworkd.conf
@@ -0,0 +1,30 @@
+[frameworkd]
+version = 1
+log_level = INFO
+log_to = syslog
+
+[odeviced.audio]
+# set default alsa scenario
+default_scenario = stereoout
+# set path to alsa scenario files
+scenario_dir = /usr/share/openmoko/scenarios
+
+[odeviced.input]
+# Keys
+report1 = AUX,key,169,1
+report2 = POWER,key,116,1
+report3 = USB,key,356,0
+report4 = HEADSET,switch,2,0
+
+[ogsmd]
+# GTA03 has a Cinterion MC75i
+modemtype = cinterion_mc75
+
+[ogpsd]
+disable = 1
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
diff --git a/packages/freesmartphone/frameworkd_git.bb b/packages/freesmartphone/frameworkd_git.bb
index ee155e64a6..a16831281e 100644
--- a/packages/freesmartphone/frameworkd_git.bb
+++ b/packages/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.4.9+gitr${SRCREV}"
-PR = "r4"
+PR = "r5"
 
 inherit distutils update-rc.d
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb
index 99777dfe00..13d395833e 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r12"
+PR = "r13"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.2.bb b/packages/gcc/gcc-cross-sdk_4.3.2.bb
index 54e7453e69..8057608e0d 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.2.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.2.bb
@@ -1,4 +1,4 @@
-PR = "r4"
+PR = "r5"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-cross-sdk_4.3.3.bb b/packages/gcc/gcc-cross-sdk_4.3.3.bb
index e4a1e41138..29ee187785 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.3.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.3.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
 
 inherit sdk
 
diff --git a/packages/gcc/gcc-package-sdk.inc b/packages/gcc/gcc-package-sdk.inc
index 767895bb07..0dc19c70b4 100644
--- a/packages/gcc/gcc-package-sdk.inc
+++ b/packages/gcc/gcc-package-sdk.inc
@@ -16,7 +16,7 @@ FILES_${PN} = "\
     ${gcclibdir}/${TARGET_SYS}/${BINV}/*.o \
     ${gcclibdir}/${TARGET_SYS}/${BINV}/specs \
     ${gcclibdir}/${TARGET_SYS}/${BINV}/lib* \
-    ${gcclibdir}/${TARGET_SYS}/${BINV}/include \
+    ${gcclibdir}/${TARGET_SYS}/${BINV}/include* \
     ${includedir}/c++/${BINV} \
     ${prefix}/${TARGET_SYS}/bin/* \
     ${prefix}/${TARGET_SYS}/lib/* \
diff --git a/packages/gtk-webcore/midori_git.bb b/packages/gtk-webcore/midori_git.bb
new file mode 100644
index 0000000000..9354a89a43
--- /dev/null
+++ b/packages/gtk-webcore/midori_git.bb
@@ -0,0 +1,31 @@
+require midori.inc
+
+DEPENDS += "python-native python-docutils-native"
+
+PV = "0.1.2+gitr${SRCREV}"
+
+SRC_URI = "http://git.xfce.org/kalikiana/midori/snapshot/midori-${SRCREV}.tar.bz2"
+S = "${WORKDIR}/midori-${SRCREV}"
+
+do_configure() {
+	./configure \
+            --prefix=${prefix} \
+            --bindir=${bindir} \
+            --sbindir=${sbindir} \
+            --libexecdir=${libexecdir} \
+            --datadir=${datadir} \
+            --sysconfdir=${sysconfdir} \
+            --sharedstatedir=${sharedstatedir} \
+            --localstatedir=${localstatedir} \
+            --libdir=${libdir} \
+            --includedir=${includedir} \
+            --infodir=${infodir} \
+            --mandir=${mandir} \
+            ${EXTRA_OECONF} 
+ 
+	sed -i /LINK_CC/d ./_build_/c4che/default.cache.py 
+	echo "LINK_CC = '${CXX}'" >>  ./_build_/c4che/default.cache.py
+}
+
+
+
diff --git a/packages/images/fso-image.inc b/packages/images/fso-image.inc
new file mode 100644
index 0000000000..6c381a054b
--- /dev/null
+++ b/packages/images/fso-image.inc
@@ -0,0 +1,143 @@
+#------------------------------------------------------
+# freesmartphone.org Image Recipe Include
+#------------------------------------------------------
+
+# no languages for now
+IMAGE_LINGUAS = ""
+
+BASE_INSTALL = "\
+  task-base \
+"
+
+ILLUME_THEME = "illume-theme-freesmartphone"
+
+X_INSTALL = "\
+  task-x11-illume \
+  task-fonts-truetype-core \
+"
+
+X_INSTALL_append_om-gta02 = "\
+  task-fonts-truetype-chinese \
+  task-fonts-truetype-japanese \
+"
+
+# tools
+TOOLS_INSTALL = "\
+  task-cli-tools \
+  task-cli-tools-python \
+"
+
+# audio
+AUDIO_INSTALL = "\
+  alsa-oss \
+  alsa-state \
+  alsa-utils-aplay \
+  alsa-utils-amixer \
+  gst-meta-audio \
+  gst-plugin-modplug \
+  gst-plugin-sid \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
+  fso-sounds \
+"
+
+GTK_INSTALL = "\
+  hicolor-icon-theme \
+  tango-icon-theme \
+  openmoko-calculator2 \
+  vala-terminal \
+  gpe-scap \
+  tangogps \
+"
+
+GAMES_INSTALL = "\
+  numptyphysics \
+"
+
+# FIXME these should rather be part of alsa-state,
+# once Om stabilizes them...
+AUDIO_INSTALL_append_om-gta01 = "\
+  openmoko-alsa-scenarios \
+"
+AUDIO_INSTALL_append_om-gta02 = "\
+  openmoko-alsa-scenarios \
+"
+
+# python
+PYTHON_INSTALL = "\
+  task-python-efl \
+  python-codecs \
+  python-gst \
+"
+
+# fso+zhone
+ZHONE_INSTALL = "\
+  task-fso-compliance \
+  zhone \
+"
+
+# additional apps
+APPS_INSTALL = "\
+  paroli \
+  gpe-gallery \
+  gpe-sketchbook \
+  gpe-filemanager \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'vagalume', d)} \
+  starling \
+"
+
+IMAGE_INSTALL = "\
+  ${BASE_INSTALL} \
+  ${X_INSTALL} \
+  ${GTK_INSTALL} \
+  ${GAMES_INSTALL} \
+  ${AUDIO_INSTALL} \
+  ${TOOLS_INSTALL} \
+  ${PYTHON_INSTALL} \
+  ${ZHONE_INSTALL} \
+  ${APPS_INSTALL} \
+"
+
+inherit image
+
+# perform some convenience tweaks to the rootfs to improve the out-of-the-box experience :M:
+fso_rootfs_postprocess() {
+    curdir=$PWD
+    cd ${IMAGE_ROOTFS}
+    # date/time
+    date "+%m%d%H%M%Y" >./etc/timestamp
+    # alias foo
+    echo "alias pico=nano" >>./etc/profile
+    echo "alias fso='cd /local/pkg/fso'" >>./etc/profile
+    echo "alias ipkg='opkg'" >>./etc/profile
+    echo "alias vim=vi" >>./etc/profile
+    echo "alias ll='ls -al'" >>./etc/profile
+    # nfs
+    mkdir -p ./local/pkg
+    echo >>./etc/fstab
+    echo "# NFS Host" >>./etc/fstab
+    echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab
+    # fix .desktop files for illume
+    desktop=`find ./usr/share/applications -name "*.desktop"`
+    for file in $desktop; do
+        echo "Categories=Office;" >>$file
+    done
+    # minimal gtk theme foo
+    mkdir -p ./etc/gtk-2.0/
+    echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc
+    echo 'gtk-icon-theme-name = "Tango"' >> ./etc/gtk-2.0/gtkrc
+    # fix strange iconv/gconf bug
+    ln -s libc.so.6 ./lib/libc.so
+    # set sensible default DNS entries
+    echo "nameserver 208.67.222.222" > ./etc/resolv.conf
+    echo "nameserver 208.67.220.220" >> ./etc/resolv.conf
+    # remove autostart of gspd (if installed), we have fso-gpsd and this conflicts
+    rm -f ./etc/init.d/gpsd
+    # silence printk
+    mkdir -p ./etc/profile.d/
+    echo "echo 0 0 0 0 >/proc/sys/kernel/printk" >./etc/profile.d/printk.sh
+    chmod a+rx ./etc/profile.d/printk.sh
+    # back on track
+    cd $curdir
+}
+
+ROOTFS_POSTPROCESS_COMMAND += "fso_rootfs_postprocess"
diff --git a/packages/linux/linux-omap-2.6.26/omap3evm/defconfig b/packages/linux/linux-omap-2.6.26/omap3evm/defconfig
index e61fad48d9..a0ba3d1e0a 100644
--- a/packages/linux/linux-omap-2.6.26/omap3evm/defconfig
+++ b/packages/linux/linux-omap-2.6.26/omap3evm/defconfig
@@ -95,7 +95,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-2.6.27/omap3evm/defconfig b/packages/linux/linux-omap-2.6.27/omap3evm/defconfig
index 64597db3d2..f58ecded2d 100644
--- a/packages/linux/linux-omap-2.6.27/omap3evm/defconfig
+++ b/packages/linux/linux-omap-2.6.27/omap3evm/defconfig
@@ -115,7 +115,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig
index 2a0818ab0f..45958e0e07 100644
--- a/packages/linux/linux-omap-2.6.28/beagleboard/defconfig
+++ b/packages/linux/linux-omap-2.6.28/beagleboard/defconfig
@@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig b/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig
index 6efe4ed660..5db83f08da 100644
--- a/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig
+++ b/packages/linux/linux-omap-2.6.28/omap3-pandora/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-2.6.28/omap3evm/defconfig b/packages/linux/linux-omap-2.6.28/omap3evm/defconfig
index e5399f3141..da5a8c4b90 100644
--- a/packages/linux/linux-omap-2.6.28/omap3evm/defconfig
+++ b/packages/linux/linux-omap-2.6.28/omap3evm/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-pm/beagleboard/defconfig b/packages/linux/linux-omap-pm/beagleboard/defconfig
index ef43e33b40..dcddd2425c 100644
--- a/packages/linux/linux-omap-pm/beagleboard/defconfig
+++ b/packages/linux/linux-omap-pm/beagleboard/defconfig
@@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-pm/omap3-pandora/defconfig b/packages/linux/linux-omap-pm/omap3-pandora/defconfig
index 6efe4ed660..5db83f08da 100644
--- a/packages/linux/linux-omap-pm/omap3-pandora/defconfig
+++ b/packages/linux/linux-omap-pm/omap3-pandora/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap-pm/omap3evm/defconfig b/packages/linux/linux-omap-pm/omap3evm/defconfig
index e5399f3141..da5a8c4b90 100644
--- a/packages/linux/linux-omap-pm/omap3evm/defconfig
+++ b/packages/linux/linux-omap-pm/omap3evm/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap/beagleboard/defconfig b/packages/linux/linux-omap/beagleboard/defconfig
index d2f0af0c60..7fb93dfc78 100644
--- a/packages/linux/linux-omap/beagleboard/defconfig
+++ b/packages/linux/linux-omap/beagleboard/defconfig
@@ -98,7 +98,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap/omap3-pandora/defconfig b/packages/linux/linux-omap/omap3-pandora/defconfig
index 6efe4ed660..5db83f08da 100644
--- a/packages/linux/linux-omap/omap3-pandora/defconfig
+++ b/packages/linux/linux-omap/omap3-pandora/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap/omap3evm/defconfig b/packages/linux/linux-omap/omap3evm/defconfig
index e5399f3141..da5a8c4b90 100644
--- a/packages/linux/linux-omap/omap3evm/defconfig
+++ b/packages/linux/linux-omap/omap3evm/defconfig
@@ -100,7 +100,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_MODULE_FORCE_UNLOAD=y
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-omap2-git/omap3evm/defconfig b/packages/linux/linux-omap2-git/omap3evm/defconfig
index e61fad48d9..a0ba3d1e0a 100644
--- a/packages/linux/linux-omap2-git/omap3evm/defconfig
+++ b/packages/linux/linux-omap2-git/omap3evm/defconfig
@@ -95,7 +95,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_TINY_SHMEM is not set
 CONFIG_BASE_SMALL=0
 CONFIG_MODULES=y
-# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_MODULE_FORCE_UNLOAD is not set
 CONFIG_MODVERSIONS=y
diff --git a/packages/linux/linux-openmoko-2.6.28_git.bb b/packages/linux/linux-openmoko-2.6.28_git.bb
index 8774721308..de38b9d173 100644
--- a/packages/linux/linux-openmoko-2.6.28_git.bb
+++ b/packages/linux/linux-openmoko-2.6.28_git.bb
@@ -26,7 +26,7 @@ SRC_URI = "\
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/gta02-packaging-defconfig ${WORKDIR}/defconfig-oe
+	install -m 644 ${CONFIG_NAME} ${WORKDIR}/defconfig-oe
 	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
 }
 
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index 56c57b395a..912d482413 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -1,26 +1,23 @@
 require linux.inc
 require linux-openmoko.inc
 
-DESCRIPTION_${PN} = "Linux ${KERNEL_RELEASE} kernel for the Openmoko Neo GSM Smartphones"
-
 DEFAULT_PREFERENCE = "-1"
 
-KERNEL_RELEASE = "2.6.28"
+KERNEL_RELEASE = "2.6.29"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe1"
+OEV = "oe0"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r3"
+PR = "r0"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://openwrt-ledtrig-netdev.patch;patch=1 \
-  file://defconfig-oe.patch \
+#  file://openwrt-ledtrig-netdev.patch;patch=1 \
+#  file://defconfig-oe.patch \
 "
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
-	install -m 644 ./arch/arm/configs/gta02_packaging_defconfig ${WORKDIR}/defconfig-oe
+	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe
 	cat ${WORKDIR}/defconfig-oe.patch | patch -p0 -d ${WORKDIR}
 }
-
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index 278a01d5ee..7bb6cd76c3 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -5,10 +5,13 @@ KERNEL_IMAGETYPE = "uImage"
 UBOOT_ENTRYPOINT = "30008000"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = 'om-gta01|om-gta02'
+COMPATIBLE_MACHINE = "om-gta01|om-gta02|om-gta03"
 
-CONFIG_NAME_om-gta01 = "gta01"
-CONFIG_NAME_om-gta02 = "gta02"
+CONFIG_NAME_om-gta01 = "gta01-moredrivers-defconfig"
+CONFIG_NAME_om-gta02 = "gta02-packaging-defconfig"
+
+CONFIG_NAME_om-gta03 = "gta03_defconfig"
+KERNEL_IMAGETYPE_om-gta03 = "zImage"
 
 CMDLINE = "unused -- bootloader passes ATAG list"
 
@@ -24,6 +27,8 @@ module_autoload_g_ether = "g_ether"
 module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 # audio (GTA02)
 module_autoload_snd-soc-neo1973-gta02-wm8753 = "snd-soc-neo1973-gta02-wm8753"
+# audio (GTA03)
+module_autoload_snd-soc-neo1973-gta02-wm8753 = ""
 # sd/mmc
 module_autoload_s3cmci = "s3cmci"
 
diff --git a/packages/parted/parted_1.8.8.bb b/packages/parted/parted_1.8.8.bb
index 4eb8aa5ca2..e93dbc8dfc 100644
--- a/packages/parted/parted_1.8.8.bb
+++ b/packages/parted/parted_1.8.8.bb
@@ -7,8 +7,6 @@ DEPENDS = "readline e2fsprogs-libs"
 PR = "r2"
 
 SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.gz \
-           file://syscalls.h \
-           file://syscalls.patch;patch=1 \
 	   file://use_llseek_syscall.patch;patch=1 \
 	   file://parted-1.8.x.patch;patch=1 \
 "
@@ -17,10 +15,6 @@ EXTRA_OECONF = "--disable-Werror ac_cv_func_calloc_0_nonnull=yes"
 
 inherit autotools pkgconfig
 
-do_configure_prepend() {
-	cp ${WORKDIR}/syscalls.h ${S}/libparted/arch/
-}
-
 do_stage() {
 	autotools_stage_all
 }