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

35 files changed, 650 insertions, 142 deletions

diff --git a/packages/aufs/aufs/aufs_create_no_manpage.patch b/packages/aufs/aufs/aufs_create_no_manpage.patch
deleted file mode 100644
index ec7c0c1138..0000000000
--- a/packages/aufs/aufs/aufs_create_no_manpage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-OE-only:
-comment: Not building the manpage is just a hack.
-
-diff -Nur aufs.vanilla/util/Makefile aufs/util/Makefile
---- aufs.vanilla/util/Makefile	2008-08-23 13:00:37.000000000 +0200
-+++ aufs/util/Makefile	2008-08-23 15:40:26.000000000 +0200
-@@ -1,25 +1,10 @@
- 
- # $Id: Makefile,v 1.10 2008/05/26 04:02:40 sfjro Exp $
- 
--all: aufs.5 aulchown
-+all: aulchown
- 	test -x ./mount.aufs || chmod a+x ./mount.aufs
- 
--aufs.5: aufs.in.5 ./c2tmac
--	${RM} $@
--	./c2tmac > $@
--	awk '{ \
--		gsub(/\140[^\047]*\047/, "\\[oq]&\\[cq]"); \
--		gsub(/\\\[oq\]\140/, "\\[oq]"); \
--		gsub(/\047\\\[cq\]/, "\\[cq]"); \
--		gsub(/\047/, "\\[aq]"); \
--		print; \
--	}' aufs.in.5 >> $@
--	chmod a-w $@
--
- CFLAGS += -O2 -Wall ${EXTRA_CFLAGS} ${ccflags-y}
- 
--.INTERMEDIATE: c2tmac.o c2tmac
--c2tmac.o: c2tmac.c ../include/linux/aufs_type.h
--
- clean:
--	${RM} c2tmac aulchown aufs.5 *~ .*~
-+	${RM} aulchown *~ .*~
diff --git a/packages/aufs/aufs_cvs.bb b/packages/aufs/aufs_cvs.bb
index cf98e08fc9..815a24fda4 100644
--- a/packages/aufs/aufs_cvs.bb
+++ b/packages/aufs/aufs_cvs.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Aufs is a stackable unification filesystem such as Unionfs, which
 HOMEPAGE = "http://aufs.sourceforge.net/"
 LICENSE = "GPL"
 PV = "cvs${SRCDATE}"
-PR = "r2"
+PR = "r3"
 
 RSUGGESTS_${PN} = "${PN}-tools"
 
@@ -10,12 +10,6 @@ inherit module
 
 S = "${WORKDIR}/aufs"
 
-# We do not create the manpage for aufs because we do not install it anyway.
-# If you want to have the manpage created you will need to add host cc to
-# the makefile else it will fail to crosscompile.
-# See http://svn.exactcode.de/t2/trunk/package/filesystem/aufs/compile.patch.cross
-# as an example how this could be done.
-
 SRC_URI = "cvs://anonymous@aufs.cvs.sourceforge.net/cvsroot/aufs;module=aufs;date=${SRCDATE}"
 
 EXTRA_OEMAKE = "KDIR=${STAGING_KERNEL_DIR} -f local.mk"
@@ -39,6 +33,16 @@ do_configure() {
 	fi
 }
 
+do_compile_prepend() {
+#compile binaries for host	
+	cd ${S}/util
+	BRANCH_MAX=$(fgrep CONFIG_AUFS_BRANCH_MAX ../local.mk | grep y | cut -d " " -f 2)
+	${BUILD_CC} -D ${BRANCH_MAX} c2tmac.c ../include/linux/aufs_type.h -o c2tmac
+	${BUILD_CC} -D ${BRANCH_MAX} c2sh.c ../include/linux/aufs_type.h -o c2sh
+	cd ${S}
+}
+
+
 do_install() {
 	install -d ${D}/${sbindir}
 	install -m 0500 mount.aufs umount.aufs auplink aulchown ${D}/${sbindir}
diff --git a/packages/busybox/busybox-1.13.2/get_header_tar.patch b/packages/busybox/busybox-1.13.2/get_header_tar.patch
new file mode 100644
index 0000000000..0121cd1b61
--- /dev/null
+++ b/packages/busybox/busybox-1.13.2/get_header_tar.patch
@@ -0,0 +1,11 @@
+--- busybox-1.13.2/archival/libunarchive/get_header_tar.c.orig	2008-11-09 18:28:02.000000000 +0100
++++ busybox-1.13.2/archival/libunarchive/get_header_tar.c	2009-02-11 22:34:52.000000000 +0100
+@@ -252,6 +252,8 @@
+ 			file_header->name = concat_path_file(tar.prefix, tar.name);
+ 		} else
+ 			file_header->name = xstrdup(tar.name);
++		if (strlen(file_header->name) > 100) 
++			file_header->name[100] = 0;
+ 	}
+ 
+ 	/* Set bits 12-15 of the files mode */
diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb
index 5ae76b900d..f00830badb 100644
--- a/packages/busybox/busybox_1.13.2.bb
+++ b/packages/busybox/busybox_1.13.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
@@ -12,6 +12,7 @@ SRC_URI = "\
   file://udhcpscript.patch;patch=1 \
   file://udhcpc-fix-nfsroot.patch;patch=1 \
   file://B921600.patch;patch=1 \
+  file://get_header_tar.patch;patch=1 \
   file://find-touchscreen.sh \
   file://busybox-cron \
   file://busybox-httpd \
@@ -31,6 +32,9 @@ EXTRA_OEMAKE += "V=1 ARCH=${TARGET_ARCH} CROSS_COMPILE=${TARGET_PREFIX}"
 
 do_configure () {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
+	if [ "${TARGET_ARCH}" = "avr32" ] ; then
+		sed -i s:CONFIG_FEATURE_OSF_LABEL=y:CONFIG_FEATURE_OSF_LABEL=n: ${S}/.config
+	fi
 	cml1_do_configure
 }
 
diff --git a/packages/clutter/aaina_svn.bb b/packages/clutter/aaina_svn.bb
index 52a2b3ae0e..862dfd8933 100644
--- a/packages/clutter/aaina_svn.bb
+++ b/packages/clutter/aaina_svn.bb
@@ -1,5 +1,6 @@
 require aaina.inc
 
+SRCREV = "3597"
 PV = "0.3.0+svnr${SRCREV}"
 
 SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http"
diff --git a/packages/clutter/clutter_0.8+git.bb b/packages/clutter/clutter_0.8+git.bb
new file mode 100644
index 0000000000..b578cbe43d
--- /dev/null
+++ b/packages/clutter/clutter_0.8+git.bb
@@ -0,0 +1,13 @@
+require clutter.inc
+
+CLUTTER_REV = "7129ee4f1b86bfcb65b5fc39021b05b74168785d"
+
+PV = "0.8.7+gitr${CLUTTER_REV}"
+PR = "r0"
+SRC_URI = "git://git.clutter-project.org/clutter.git;protocol=git;branch=clutter-0-8;rev=${CLUTTER_REV} \
+           file://enable-tests-r2990.patch;patch=1"
+
+S = "${WORKDIR}/git"
+
+
+
diff --git a/packages/clutter/clutter_0.8+svn.bb b/packages/clutter/clutter_0.8+svn.bb
deleted file mode 100644
index a203165ca8..0000000000
--- a/packages/clutter/clutter_0.8+svn.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require clutter.inc
-
-CLUTTER_REV = "3597"
-
-PV = "0.8.4+svnr${CLUTTER_REV}"
-PR = "r0"
-SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-8;proto=http;rev=${CLUTTER_REV} \
-           file://enable_tests.patch;patch=1;maxrev=2989 \
-           file://enable-tests-r2990.patch;patch=1;minrev=2990"
-
-S = "${WORKDIR}/clutter-0-8"
-
-
-
diff --git a/packages/dnsmasq/dnsmasq-dbus_2.46.bb b/packages/dnsmasq/dnsmasq-dbus_2.47.bb
index f6070a1987..d03dbdb06e 100644
--- a/packages/dnsmasq/dnsmasq-dbus_2.46.bb
+++ b/packages/dnsmasq/dnsmasq-dbus_2.47.bb
@@ -2,12 +2,9 @@
 
 require dnsmasq.inc
 
-PR = "r1"
 DEPENDS = "dbus"
 EXTRA_OEMAKE = "COPTS=-DHAVE_DBUS"
 
-SRC_URI += "file://dbus_introspection.patch;patch=1"
-
 do_install_append () {
         install -d ${D}${sysconfdir}/dbus-1/system.d
         install -m 644 dbus/dnsmasq.conf ${D}${sysconfdir}/dbus-1/system.d/
diff --git a/packages/dnsmasq/dnsmasq_2.46.bb b/packages/dnsmasq/dnsmasq_2.47.bb
index 9a79c6e76f..83aea1d299 100644
--- a/packages/dnsmasq/dnsmasq_2.46.bb
+++ b/packages/dnsmasq/dnsmasq_2.47.bb
@@ -1,3 +1 @@
-PR = "r1"
-
 require dnsmasq.inc
diff --git a/packages/dnsmasq/files/dbus_introspection.patch b/packages/dnsmasq/files/dbus_introspection.patch
deleted file mode 100644
index 52cbb6e25b..0000000000
--- a/packages/dnsmasq/files/dbus_introspection.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -urN dnsmasq-2.46.orig/src/dbus.c dnsmasq-2.46/src/dbus.c
---- dnsmasq-2.46.orig/src/dbus.c	2008-11-14 21:02:08.000000000 +0100
-+++ dnsmasq-2.46/src/dbus.c	2008-12-15 10:45:48.000000000 +0100
-@@ -21,6 +21,42 @@
- #define DBUS_API_SUBJECT_TO_CHANGE
- #include <dbus/dbus.h>
- 
-+const char* introspection_xml =
-+"<!DOCTYPE node PUBLIC \"-//freedesktop//DTD D-BUS Object Introspection 1.0//EN\"\n"
-+"\"http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd\">\n"
-+"<node name=\"" DNSMASQ_PATH "\">\n"
-+"  <interface name=\"org.freedesktop.DBus.Introspectable\">\n"
-+"    <method name=\"Introspect\">\n"
-+"      <arg name=\"data\" direction=\"out\" type=\"s\"/>\n"
-+"    </method>\n"
-+"  </interface>\n"
-+"  <interface name=\"" DNSMASQ_SERVICE "\">\n"
-+"    <method name=\"ClearCache\">\n"
-+"    </method>\n"
-+"    <method name=\"GetVersion\">\n"
-+"      <arg name=\"version\" direction=\"out\" type=\"s\"/>\n"
-+"    </method>\n"
-+"    <method name=\"SetServers\">\n"
-+"      <arg name=\"servers\" direction=\"in\" type=\"av\"/>\n"
-+"    </method>\n"
-+"    <signal name=\"DhcpLeaseAdded\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"    <signal name=\"DhcpLeaseDeleted\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"    <signal name=\"DhcpLeaseUpdated\">\n"
-+"      <arg name=\"ipaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hwaddr\" type=\"s\"/>\n"
-+"      <arg name=\"hostname\" type=\"s\"/>\n"
-+"    </signal>\n"
-+"  </interface>\n"
-+"</node>\n";
-+
- struct watch {
-   DBusWatch *watch;      
-   struct watch *next;
-@@ -229,7 +265,15 @@
- {
-   char *method = (char *)dbus_message_get_member(message);
-    
--  if (strcmp(method, "GetVersion") == 0)
-+  if (dbus_message_is_method_call(message, DBUS_INTERFACE_INTROSPECTABLE, "Introspect"))
-+    {
-+      DBusMessage *reply = dbus_message_new_method_return(message);
-+
-+      dbus_message_append_args(reply, DBUS_TYPE_STRING, &introspection_xml, DBUS_TYPE_INVALID);
-+      dbus_connection_send (connection, reply, NULL);
-+      dbus_message_unref (reply);
-+    }
-+  else if (strcmp(method, "GetVersion") == 0)
-     {
-       char *v = VERSION;
-       DBusMessage *reply = dbus_message_new_method_return(message);
diff --git a/packages/ltp/ltp-20090131/cross-compile.patch b/packages/ltp/ltp-20090131/cross-compile.patch
new file mode 100644
index 0000000000..b414b6fc0f
--- /dev/null
+++ b/packages/ltp/ltp-20090131/cross-compile.patch
@@ -0,0 +1,352 @@
+---
+ Makefile                                                              |    4 +++-
+ lib/Makefile                                                          |    3 ---
+ m4/GNUmakefile                                                        |    3 ---
+ pan/Makefile                                                          |    2 --
+ testcases/ballista/ballista/Makefile                                  |    2 +-
+ testcases/ballista/ballista/compile/Makefile                          |    8 ++++----
+ testcases/kernel/device-drivers/acpi/Makefile                         |    2 +-
+ testcases/kernel/device-drivers/agp/user_space/Makefile               |    6 +++---
+ testcases/kernel/device-drivers/base/user_base/Makefile               |    6 +++---
+ testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile |    6 +++---
+ testcases/kernel/device-drivers/drm/user_space/Makefile               |    2 +-
+ testcases/kernel/device-drivers/include/Makefile                      |    2 +-
+ testcases/kernel/device-drivers/nls/Makefile                          |    2 +-
+ testcases/kernel/device-drivers/pci/user_tpci/Makefile                |    6 +++---
+ testcases/kernel/device-drivers/tbio/user_space/Makefile              |    6 +++---
+ testcases/kernel/device-drivers/usb/user_usb/Makefile                 |    6 +++---
+ testcases/kernel/fs/fs-bench/Makefile                                 |    6 +++---
+ testcases/kernel/fs/scsi/ltpfs/Makefile                               |    2 +-
+ testcases/kernel/sched/hyperthreading/ht_affinity/Makefile            |    4 ++--
+ testcases/kernel/sched/hyperthreading/ht_enabled/Makefile             |    2 +-
+ testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile           |    2 +-
+ 21 files changed, 38 insertions(+), 44 deletions(-)
+
+Index: ltp-full-20090131/Makefile
+===================================================================
+--- ltp-full-20090131.orig/Makefile
++++ ltp-full-20090131/Makefile
+@@ -5,14 +5,16 @@ CROSS_COMPILER = $(CROSS_COMPILE)
+ endif
+ ifdef CROSS_COMPILER
+ CC=$(CROSS_COMPILER)gcc
++CPP=$(CROSS_COMPILER)g++
+ AR=$(CROSS_COMPILER)ar
+ RANLIB=$(CROSS_COMPILER)ranlib
+ endif
++PREFIX=/opt/ltp
+ 
+ HAS_NUMA=$(shell sh tools/scripts/numa_test.sh)
+ 
+ export CFLAGS += -Wall $(CROSS_CFLAGS)
+-export CC AR RANLIB CPPFLAGS LDFLAGS HAS_NUMA
++export CC CPP AR RANLIB CPPFLAGS LDFLAGS HAS_NUMA
+ 
+ -include config.mk
+ 
+Index: ltp-full-20090131/testcases/ballista/ballista/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/ballista/ballista/Makefile
++++ ltp-full-20090131/testcases/ballista/ballista/Makefile
+@@ -24,7 +24,7 @@
+ ########################
+ 
+ # compiler info for the host
+-CC = g++ -Wno-deprecated
++CC = $(CPP) -Wno-deprecated
+ CFLAGS += -w ${TARGET_DEF}
+ CLIBS = -lpthread -ldl -lnsl -rdynamic
+ TEST_MAN_FILE = selfHost
+Index: ltp-full-20090131/testcases/ballista/ballista/compile/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/ballista/ballista/compile/Makefile
++++ ltp-full-20090131/testcases/ballista/ballista/compile/Makefile
+@@ -19,14 +19,14 @@ dFLAGS=-g -DDEBUG
+ FLAGS= -O -Wall
+ PFLAGS= -p -g3
+ 
+-CPPCOMP= g++
++CPPCOMP= $(CPP)
+ 
+ #
+ # The following is "boilerplate" to set up the standard compilation
+ # commands:
+ .SUFFIXES:
+ .SUFFIXES: .cpp .c .cc .h .o
+-.c.o:  ; gcc $(FLAGS) -c $*.c
++.c.o:  ; $(CC) $(FLAGS) -c $*.c
+ .cc.o:  ; $(CPPCOMP) $(FLAGS) -c $*.cc
+ .cpp.o:  ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cpp
+ .cxx.o:  ; $(CPPCOMP) $(FLAGS) $(INC) -c $*.cxx
+@@ -41,10 +41,10 @@ all: blexer bparser
+ 	chmod 700 ../templates/do_parse
+ 
+ blexer: jlist.o butil.o lex.yy.o blexer.o
+-	gcc $(FLAGS)  -o blexer jlist.o butil.o lex.yy.o blexer.o 
++	$(CC) $(FLAGS)  -o blexer jlist.o butil.o lex.yy.o blexer.o 
+ 
+ bparser: bparser.o 
+-	g++ $(FLAGS) -o bparser bparser.o butil.c
++	$(CPP) $(FLAGS) -o bparser bparser.o butil.c
+ 
+ jlist.o: jlist.c butil.h jlist.h
+ 
+Index: ltp-full-20090131/testcases/kernel/device-drivers/acpi/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/acpi/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/acpi/Makefile
+@@ -15,7 +15,7 @@ PWD	:= $(shell pwd)
+ 
+ default:
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+-	gcc  $(CFLAGS) -o LtpAcpiMain  LtpAcpiMain.c
++	$(CC)  $(CFLAGS) -o LtpAcpiMain  LtpAcpiMain.c
+ #	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ endif
+ 
+Index: ltp-full-20090131/testcases/kernel/device-drivers/agp/user_space/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/agp/user_space/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/agp/user_space/Makefile
+@@ -1,8 +1,8 @@
+ test_agp: tagp_ki.o user_tagp.o
+-	gcc tagp_ki.o user_tagp.o -o test_agp 
++	$(CC) tagp_ki.o user_tagp.o -o test_agp 
+ 
+ tagp_ki.o: tagp_ki.c
+-	gcc -c tagp_ki.c
++	$(CC) -c tagp_ki.c
+ 
+ user_tagp.o: user_tagp.c
+-	gcc -c user_tagp.c
++	$(CC) -c user_tagp.c
+Index: ltp-full-20090131/testcases/kernel/device-drivers/base/user_base/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/base/user_base/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/base/user_base/Makefile
+@@ -1,11 +1,11 @@
+ test_base: tbase_ki.o user_tbase.o
+-	gcc tbase_ki.o user_tbase.o -o test_base
++	$(CC) tbase_ki.o user_tbase.o -o test_base
+ 
+ tbase_ki.o: tbase_ki.c
+-	gcc -c tbase_ki.c
++	$(CC) -c tbase_ki.c
+ 
+ user_tbase.o: user_tbase.c
+-	gcc -c user_tbase.c
++	$(CC) -c user_tbase.c
+ 
+ clean: 
+ 	 rm -f *.o 2>/dev/null || true
+Index: ltp-full-20090131/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/dev_sim_framework/user_space/Makefile
+@@ -1,8 +1,8 @@
+ test_mod: tmod_ki.o user_tmod.o
+-	gcc tmod_ki.o user_tmod.o -o test_mod
++	$(CC) tmod_ki.o user_tmod.o -o test_mod
+ 
+ tmod_ki.o: tmod_ki.c
+-	gcc -c tmod_ki.c
++	$(CC) -c tmod_ki.c
+ 
+ user_tmod.o: user_tmod.c
+-	gcc -c user_tmod.c
++	$(CC) -c user_tmod.c
+Index: ltp-full-20090131/testcases/kernel/device-drivers/drm/user_space/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/drm/user_space/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/drm/user_space/Makefile
+@@ -2,4 +2,4 @@
+ 	KDIR := /lib/modules/$(shell uname -r)/build
+ 	CFLAGS := -I$(KDIR)/drivers/char/drm
+ default:
+-	gcc -o test_drm  user_tdrm.c $(CFLAGS)
++	$(CC) -o test_drm  user_tdrm.c $(CFLAGS)
+Index: ltp-full-20090131/testcases/kernel/device-drivers/include/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/include/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/include/Makefile
+@@ -14,7 +14,7 @@ PWD	:= $(shell pwd)
+ 
+ default:
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+-	gcc -Wall -o userBlockInclude userBlockInclude.c
++	$(CC) -Wall -o userBlockInclude userBlockInclude.c
+ #	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ endif
+ 
+Index: ltp-full-20090131/testcases/kernel/device-drivers/nls/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/nls/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/nls/Makefile
+@@ -13,7 +13,7 @@ PWD	:= $(shell pwd)
+ 
+ default:
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+-	gcc $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
++	$(CC) $(EXTRA_CFLAGS) -o userBlockNLS userBlockNLS.c
+ #	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ 
+ clean:
+Index: ltp-full-20090131/testcases/kernel/device-drivers/pci/user_tpci/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/pci/user_tpci/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/pci/user_tpci/Makefile
+@@ -1,8 +1,8 @@
+ test_pci: tpci_ki.o user_tpci.o
+-	gcc tpci_ki.o user_tpci.o -o test_pci
++	$(CC) tpci_ki.o user_tpci.o -o test_pci
+ 
+ tpci_ki.o: tpci_ki.c 
+-	gcc -c tpci_ki.c
++	$(CC) -c tpci_ki.c
+ 
+ user_tpci.o: user_tpci.c
+-	gcc -c user_tpci.c
++	$(CC) -c user_tpci.c
+Index: ltp-full-20090131/testcases/kernel/device-drivers/tbio/user_space/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/tbio/user_space/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/tbio/user_space/Makefile
+@@ -1,8 +1,8 @@
+ test_bio: tbio_ki.o user_tbio.o
+-	gcc -g tbio_ki.o user_tbio.o -o test_bio
++	$(CC) -g tbio_ki.o user_tbio.o -o test_bio
+ 
+ tbio_ki.o: tbio_ki.c
+-	gcc -c -g  tbio_ki.c
++	$(CC) -c -g  tbio_ki.c
+ 
+ user_tbio.o: user_tbio.c
+-	gcc -c -g user_tbio.c
++	$(CC) -c -g user_tbio.c
+Index: ltp-full-20090131/testcases/kernel/device-drivers/usb/user_usb/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/device-drivers/usb/user_usb/Makefile
++++ ltp-full-20090131/testcases/kernel/device-drivers/usb/user_usb/Makefile
+@@ -1,8 +1,8 @@
+ test_usb: tusb_ki.o user_tusb.o
+-	gcc tusb_ki.o user_tusb.o -o test_usb
++	$(CC) tusb_ki.o user_tusb.o -o test_usb
+ 
+ tusb_ki.o: tusb_ki.c 
+-	gcc -c tusb_ki.c
++	$(CC) -c tusb_ki.c
+ 
+ user_tusb.o: user_tusb.c
+-	gcc -c user_tusb.c
++	$(CC) -c user_tusb.c
+Index: ltp-full-20090131/testcases/kernel/fs/fs-bench/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/fs/fs-bench/Makefile
++++ ltp-full-20090131/testcases/kernel/fs/fs-bench/Makefile
+@@ -6,13 +6,13 @@ all: ${EXECS}
+ 	@echo done
+ 
+ cr: create-files.o ${UTILS}
+-	gcc ${UTILS} create-files.o -lm -o cr
++	$(CC) ${UTILS} create-files.o -lm -o cr
+ 
+ ra: random-access.o
+-	gcc random-access.o -o ra
++	$(CC) random-access.o -o ra
+ 
+ radc: random-del-create.o ${UTILS}
+-	gcc  ${UTILS} random-del-create.o -lm -o radc
++	$(CC)  ${UTILS} random-del-create.o -lm -o radc
+ 
+ install:
+ 	 @set -e; for i in $(EXECS) $(SCRIPTS); do ln -f $$i ../../../bin/$$i ; done
+Index: ltp-full-20090131/testcases/kernel/fs/scsi/ltpfs/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/fs/scsi/ltpfs/Makefile
++++ ltp-full-20090131/testcases/kernel/fs/scsi/ltpfs/Makefile
+@@ -15,7 +15,7 @@ PWD	:= $(shell pwd)
+ 
+ default:
+ 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
+-	gcc  $(CFLAGS) -o ltpfstest -lm  main.c 
++	$(CC)  $(CFLAGS) -o ltpfstest -lm  main.c 
+ #	$(MAKE) -C $(KERNELDIR) SUBDIRS=$(PWD) modules
+ endif
+ 
+Index: ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
++++ ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_affinity/Makefile
+@@ -7,9 +7,9 @@ TARGETS   := ht_affinity
+ all: $(TARGETS)
+ 
+ #ht_affinity: HTaffinity.o HTutils.o
+-#	gcc -o ht_affinity HTaffinity.o HTutils.o $(CFLAGS) $(LOADLIBES)
++#	$(CC) -o ht_affinity HTaffinity.o HTutils.o $(CFLAGS) $(LOADLIBES)
+ ht_affinity:
+-	gcc -o ht_affinity HTaffinity.c HTutils.c $(CFLAGS) $(LOADLIBES)
++	$(CC) -o ht_affinity HTaffinity.c HTutils.c $(CFLAGS) $(LOADLIBES)
+ 
+ install:
+ 	@set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
+Index: ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
++++ ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_enabled/Makefile
+@@ -7,7 +7,7 @@ TARGETS  := ht_enabled
+ all: $(TARGETS)
+ 
+ ht_enabled:
+-	gcc -o ht_enabled HTenabled.c HTutils.c $(CFLAGS) $(LOADLIBES)
++	$(CC) -o ht_enabled HTenabled.c HTutils.c $(CFLAGS) $(LOADLIBES)
+ 
+ install:
+ 	@set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
+Index: ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile
++++ ltp-full-20090131/testcases/kernel/sched/hyperthreading/ht_interrupt/Makefile
+@@ -7,7 +7,7 @@ TARGETS = ht_interrupt
+ all: $(TARGETS)
+ 
+ ht_interrupt:
+-	gcc -o ht_interrupt HTinterrupt.c HTutils.c $(CFLAGS) $(LOADLIBES) 
++	$(CC) -o ht_interrupt HTinterrupt.c HTutils.c $(CFLAGS) $(LOADLIBES) 
+ 
+ install:
+ 	@set -e; for i in $(TARGETS) ; do ln -f $$i ../../../../bin/$$i ; done
+Index: ltp-full-20090131/lib/Makefile
+===================================================================
+--- ltp-full-20090131.orig/lib/Makefile
++++ ltp-full-20090131/lib/Makefile
+@@ -1,6 +1,3 @@
+-
+-PREFIX=/opt/ltp
+-
+ CFLAGS+= -Wall
+ CFLAGS+= -D_USC_LIB_
+ CPPFLAGS+= -I../include 
+Index: ltp-full-20090131/m4/GNUmakefile
+===================================================================
+--- ltp-full-20090131.orig/m4/GNUmakefile
++++ ltp-full-20090131/m4/GNUmakefile
+@@ -1,6 +1,3 @@
+-
+-
+-PREFIX=/opt/ltp
+ M4MACROS=$(notdir $(wildcard *.m4))
+ 
+ all:
+Index: ltp-full-20090131/pan/Makefile
+===================================================================
+--- ltp-full-20090131.orig/pan/Makefile
++++ ltp-full-20090131/pan/Makefile
+@@ -1,8 +1,6 @@
+-
+ LOADLIBES += -lm
+ LFLAGS += -l -w
+ CFLAGS += -w 
+-PREFIX = /opt/ltp
+ 
+ all: pan bump scanner
+ 
diff --git a/packages/ltp/ltp-20090131/fix-tcore_patch_test_suites.patch b/packages/ltp/ltp-20090131/fix-tcore_patch_test_suites.patch
new file mode 100644
index 0000000000..92a8879410
--- /dev/null
+++ b/packages/ltp/ltp-20090131/fix-tcore_patch_test_suites.patch
@@ -0,0 +1,20 @@
+---
+ testcases/misc/tcore_patch_test_suites/tcore.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: ltp-full-20090131/testcases/misc/tcore_patch_test_suites/tcore.c
+===================================================================
+--- ltp-full-20090131.orig/testcases/misc/tcore_patch_test_suites/tcore.c
++++ ltp-full-20090131/testcases/misc/tcore_patch_test_suites/tcore.c
+@@ -27,9 +27,10 @@ extern int  Tst_count;               /* 
+ extern char *TESTDIR;                /* temporary dir created by tst_tmpdir() */
+ /* Global Variables */
+ char *TCID     = "tcore";            /* test program identifier.              */
+-int  TST_TOTAL = 1;                  /* total number of tests in this file.   */
+ 
+ #if defined __i386__ || defined(__x86_64__)
++int  TST_TOTAL = 1;                  /* total number of tests in this file.   */
++
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
diff --git a/packages/ltp/ltp-20090131/no-IDcheck.patch b/packages/ltp/ltp-20090131/no-IDcheck.patch
new file mode 100644
index 0000000000..d43780748f
--- /dev/null
+++ b/packages/ltp/ltp-20090131/no-IDcheck.patch
@@ -0,0 +1,17 @@
+---
+ Makefile |    2 --
+ 1 file changed, 2 deletions(-)
+
+Index: ltp-full-20090131/Makefile
+===================================================================
+--- ltp-full-20090131.orig/Makefile
++++ ltp-full-20090131/Makefile
+@@ -37,8 +37,6 @@ install: all
+ 	@$(MAKE) -C doc/man1 install
+ 	@$(MAKE) -C doc/man3 install
+ 
+-	@./IDcheck.sh
+-
+ libltp.a: config.h
+ 	@$(MAKE) -C lib $@
+ 
diff --git a/packages/ltp/ltp-20090131/no_epoll_create2_mips.patch b/packages/ltp/ltp-20090131/no_epoll_create2_mips.patch
new file mode 100644
index 0000000000..84ce8e4128
--- /dev/null
+++ b/packages/ltp/ltp-20090131/no_epoll_create2_mips.patch
@@ -0,0 +1,17 @@
+---
+ testcases/kernel/syscalls/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ltp-full-20090131/testcases/kernel/syscalls/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/syscalls/Makefile
++++ ltp-full-20090131/testcases/kernel/syscalls/Makefile
+@@ -25,7 +25,7 @@ EXCLUDE_DIR=epoll
+ #
+ # Commented this out since there are directories here we don't want built by default
+ #
+-SUBDIR = `ls */Makefile | sed "s/Makefile//g"` 
++SUBDIR = `ls */Makefile | sed "s/Makefile//g | grep -vE "^epoll_create2""` 
+ UCLINUX_SUBDIR = `ls */Makefile | sed "s/Makefile//g" | grep -vE "^fork|epoll|capget|capset|chmod|chown|llseek|nftw|clone|profil|getcontext"`
+ 
+ all:
diff --git a/packages/ltp/ltp-20090131/no_hyperthreading_tests.patch b/packages/ltp/ltp-20090131/no_hyperthreading_tests.patch
new file mode 100644
index 0000000000..6ef9635df9
--- /dev/null
+++ b/packages/ltp/ltp-20090131/no_hyperthreading_tests.patch
@@ -0,0 +1,14 @@
+---
+ testcases/kernel/sched/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ltp-full-20090131/testcases/kernel/sched/Makefile
+===================================================================
+--- ltp-full-20090131.orig/testcases/kernel/sched/Makefile
++++ ltp-full-20090131/testcases/kernel/sched/Makefile
+@@ -1,4 +1,4 @@
+-SUBDIRS = cfs-scheduler clisrv hyperthreading nptl process_stress pthreads sched_stress tool 
++SUBDIRS = cfs-scheduler clisrv nptl process_stress pthreads sched_stress tool 
+ 
+ all:
+ 	@set -e; for i in $(SUBDIRS); do $(MAKE) -C $$i ; done
diff --git a/packages/ltp/ltp-20090131/runltp-path.patch b/packages/ltp/ltp-20090131/runltp-path.patch
new file mode 100644
index 0000000000..607e019e61
--- /dev/null
+++ b/packages/ltp/ltp-20090131/runltp-path.patch
@@ -0,0 +1,17 @@
+---
+ runltp |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: ltp-full-20090131/runltp
+===================================================================
+--- ltp-full-20090131.orig/runltp
++++ ltp-full-20090131/runltp
+@@ -74,7 +74,7 @@ setup()
+         echo "FATAL: unable to change directory to $(dirname $0)"
+         exit 1
+     }
+-    export LTPROOT=${PWD}
++    export LTPROOT=/usr/libexec/ltp
+     export TMPBASE="/tmp"
+     export PATH="${PATH}:${LTPROOT}/testcases/bin"
+ 
diff --git a/packages/ltp/ltp_20090131.bb b/packages/ltp/ltp_20090131.bb
new file mode 100644
index 0000000000..0e52ae3596
--- /dev/null
+++ b/packages/ltp/ltp_20090131.bb
@@ -0,0 +1,73 @@
+DESCRIPTION = "Linux Test Project"
+HOMEPAGE = "http://ltp.sourceforge.net"
+LICENSE = "GPL"
+SECTION = "console/utils"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/ltp/ltp-full-${PV}.tgz \
+           file://cross-compile.patch;patch=1 \
+           file://runltp-path.patch;patch=1 \
+           file://fix-tcore_patch_test_suites.patch;patch=1 \
+           file://no-IDcheck.patch;patch=1 \
+           file://no_hyperthreading_tests.patch;patch=1"
+
+SRC_URI_append_mips += "file://no_epoll_create2_mips.patch;patch=1"
+SRC_URI_append_mipsel += "file://no_epoll_create2_mips.patch;patch=1"
+
+S = "${WORKDIR}/ltp-full-${PV}"
+
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${HOST_PREFIX}"
+
+FILES_${PN}-dbg =  "${libexecdir}/ltp/*/*/*/*/*/.debug"
+FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/*/*/.debug"
+FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/*/.debug"
+FILES_${PN}-dbg += "${libexecdir}/ltp/*/*/.debug"
+FILES_${PN}-dbg += "${libexecdir}/ltp/*/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/trigo/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/iperb/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/exp_log/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/power/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/float/bessel/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/abs/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/atof/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/nextafter/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/math/fptests/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/f00f/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/misc/crash/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/pan/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/network/ipv6/*/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/network/rpc/rpc01/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/bin/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/kernel/syscalls/*/.debug"
+#FILES_${PN}-dbg += "${libexecdir}/ltp/testcases/kernel/mem/*/.debug"
+
+do_compile(){
+        oe_runmake CROSS_COMPILE=${HOST_PREFIX}
+}
+
+do_install(){
+        export CREATE=0
+        export LTPROOT=${D}/usr/libexec/ltp/testcases
+
+        oe_runmake DESTDIR=${D} PREFIX=/usr/libexec/ltp install
+
+        install -d ${D}/usr/libexec/ltp/testcases
+        install -d ${D}/usr/libexec/ltp/pan
+
+        #install testcases 
+        #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/testcases
+        #install -m 0755 ${WORKDIR}/testcases ${D}/usr/libexec/ltp/
+        
+        # treecopy testcases pan/pan runtest ver_linux IDcheck.sh \
+        # ${D}/usr/libexec/ltp
+        cp testcases    ${D}/usr/libexec/ltp/ -rfp
+        rm              ${D}/usr/libexec/ltp/testcases/ballista -rf
+        cp pan/pan      ${D}/usr/libexec/ltp/pan -p
+        cp runtest      ${D}/usr/libexec/ltp/ -rfp
+        cp ver_linux    ${D}/usr/libexec/ltp/ -p
+        cp runltp       ${D}/usr/libexec/ltp/ -p
+        cp IDcheck.sh   ${D}/usr/libexec/ltp/ -p
+
+	# We don't want "devel" stuff
+	rm -rf ${D}/opt/ltp/include
+	rm ${D}/usr/libexec/ltp/share/pkgconfig/ltp.pc
+}
diff --git a/packages/ogre/ogre-egl_svn.bb b/packages/ogre/ogre-egl_svn.bb
index 61d2429945..9ca9e8f54f 100644
--- a/packages/ogre/ogre-egl_svn.bb
+++ b/packages/ogre/ogre-egl_svn.bb
@@ -1,8 +1,8 @@
 DESCRIPTION = "OGRE (Object-Oriented Graphics Rendering Engine) is a scene-oriented, flexible 3D engine "
 LICENSE = "LGPL"
-DEPENDS = "zziplib boost freeimage freetype virtual/libx11 virtual/egl"
+DEPENDS = "gtk+ wgois cppunit zziplib boost freeimage freetype virtual/libx11 virtual/egl"
 
-PR = "r1"
+PR = "r3"
 
 SRCREV = "8310"
 PV = "1.6.1+svnr${SRCREV}"
@@ -14,7 +14,7 @@ SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https
 inherit autotools_stage
 
 # This is the EGL version
-EXTRA_OECONF = " --with-allocator=std --enable-threading=no --disable-cg --enable-gles "
+EXTRA_OECONF = " --with-gui=gtk --disable-freetypetest --enable-ogre-demos --with-allocator=std --enable-threading=no --disable-cg --enable-gles "
 
 S = "${WORKDIR}/trunk"
 
@@ -25,7 +25,20 @@ do_configure_prepend() {
 	sed -i -e /OGRE_DETECT_ENDIAN/d ${S}/configure.in
 }
 
-FILES_${PN}-dbg += "${libdir}/OGRE/.debug"
+do_install_append() {
+	install -d ${D}${datadir}/ogre3d/samples
+	mv ${D}${S}/Samples/* ${D}${datadir}/ogre3d/samples/
+	cp ${S}/Samples/Common/bin/Release/*cfg ${D}${datadir}/ogre3d/samples/Common/bin
+
+	install -d ${D}${datadir}/ogre3d/Media 
+	cp -r ${S}/Samples/Media/* ${D}${datadir}/ogre3d/Media/
+	find ${D} -name ".svn" | xargs rm -rf
+}
+
+PACKAGES += "${PN}-samples"
+
+FILES_${PN}-samples = "${datadir}/ogre3d/"
+FILES_${PN}-dbg += "${libdir}/OGRE/.debug ${datadir}/ogre3d/samples/*/*/.debug"
 FILES_${PN}-dev += "${libdir}/OGRE/*.la"
 FILES_${PN} += "${libdir}/libOgreMain-*.so ${libdir}/OGRE/*.so"
 
diff --git a/packages/ogre/wgois_1.2.0.bb b/packages/ogre/wgois_1.2.0.bb
new file mode 100644
index 0000000000..ff59a3bcae
--- /dev/null
+++ b/packages/ogre/wgois_1.2.0.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "Object Oriented Input System (OIS) is meant to be a cross platform, simple solution for using all kinds of Input Devices."
+LICENSE = "zlib"
+DEPENDS = "virtual/libx11"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wgois/ois_${PV}.tar.gz"
+
+inherit autotools_stage
+
+S = "${WORKDIR}/ois"
+
+FILES_${PN} += "${libdir}/libOIS-1*.so"
+
+
+
+
diff --git a/packages/opkg/files/opkg_unarchive.patch b/packages/opkg/files/opkg_unarchive.patch
new file mode 100644
index 0000000000..9e5ccfb714
--- /dev/null
+++ b/packages/opkg/files/opkg_unarchive.patch
@@ -0,0 +1,13 @@
+--- trunk/libbb/unarchive.c.orig	2009-02-11 22:14:58.000000000 +0100
++++ trunk/libbb/unarchive.c	2009-02-11 22:15:07.000000000 +0100
+@@ -606,6 +606,10 @@
+                 tar_entry->name = concat_path_file(tar.formated.prefix, tar.formated.name);
+         }
+ 
++	if (strlen(tar_entry->name) > 100) {
++		tar_entry->name[100] = 0;
++	}
++
+ 	// tar_entry->name = xstrdup(tar.formated.name);
+ 
+ /*
diff --git a/packages/opkg/opkg-native_svn.bb b/packages/opkg/opkg-native_svn.bb
index 57c6e61fb0..82c74e0b86 100644
--- a/packages/opkg/opkg-native_svn.bb
+++ b/packages/opkg/opkg-native_svn.bb
@@ -1,7 +1,7 @@
 require opkg.inc
 
 DEPENDS = "curl-native"
-PR = "r2"
+PR = "r3"
 
 target_libdir := "${libdir}"
 
diff --git a/packages/opkg/opkg-nogpg-nocurl_svn.bb b/packages/opkg/opkg-nogpg-nocurl_svn.bb
index 4daa58f274..71133cb3d6 100644
--- a/packages/opkg/opkg-nogpg-nocurl_svn.bb
+++ b/packages/opkg/opkg-nogpg-nocurl_svn.bb
@@ -10,7 +10,7 @@ SRC_URI += " \
 	    file://opkg_wget_nogpg_02_use_vfork_system.patch;patch=1 \
 	    file://opkg_wget_nogpg_03_fix_tmpdirs.patch;patch=1 \
 	   "
-PR = "r3"
+PR = "r4"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/packages/opkg/opkg-nogpg_svn.bb b/packages/opkg/opkg-nogpg_svn.bb
index f58df2fb18..a9297d7645 100644
--- a/packages/opkg/opkg-nogpg_svn.bb
+++ b/packages/opkg/opkg-nogpg_svn.bb
@@ -3,7 +3,7 @@ require opkg_svn.bb
 DEPENDS = "curl"
 PROVIDES += "opkg"
 
-PR = "r2"
+PR = "r3"
 
 SRCREV = "${SRCREV_pn-opkg}"
 
diff --git a/packages/opkg/opkg-sdk_svn.bb b/packages/opkg/opkg-sdk_svn.bb
index c28fe97591..d9b3727d82 100644
--- a/packages/opkg/opkg-sdk_svn.bb
+++ b/packages/opkg/opkg-sdk_svn.bb
@@ -1,7 +1,7 @@
 require opkg.inc
 
 DEPENDS = "curl-sdk"
-PR = "r2"
+PR = "r3"
 target_libdir := "${libdir}"
 inherit sdk
 
diff --git a/packages/opkg/opkg.inc b/packages/opkg/opkg.inc
index b586e70ab9..bd16f92e20 100644
--- a/packages/opkg/opkg.inc
+++ b/packages/opkg/opkg.inc
@@ -5,7 +5,8 @@ LICENSE = "GPL"
 DEPENDS = "curl gpgme"
 PV = "0.1.6+svnr${SRCREV}"
 
-SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http"
+SRC_URI = "svn://opkg.googlecode.com/svn;module=trunk;proto=http \
+	file://opkg_unarchive.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
 inherit autotools pkgconfig
diff --git a/packages/opkg/opkg_svn.bb b/packages/opkg/opkg_svn.bb
index 4cf1c5caab..a4728970ce 100644
--- a/packages/opkg/opkg_svn.bb
+++ b/packages/opkg/opkg_svn.bb
@@ -1,6 +1,6 @@
 require opkg.inc
 
-PR = "r1"
+PR = "r2"
 
 PACKAGES =+ "libopkg-dev libopkg"
 
diff --git a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
index 9fae1ff149..aba613c14b 100644
--- a/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
+++ b/packages/powervr-drivers/libgles-omap3_3.00.00.06.bb
@@ -1,7 +1,7 @@
 require libgles-omap3.inc
 
 # Not released yet
-DEFAULT_PREFERENCE = "-1"
+#DEFAULT_PREFERENCE = "-1"
 PR = "r5"
 
 SGXPV = "3_00_00_06"
diff --git a/packages/python/python-coherence_svn.bb b/packages/python/python-coherence_svn.bb
index e6f5fafb53..083e2faef0 100644
--- a/packages/python/python-coherence_svn.bb
+++ b/packages/python/python-coherence_svn.bb
@@ -3,17 +3,22 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 HOMEPAGE = "http://coherence.beebits.net/wiki"
 
-PR = "r6"
+PR = "r0"
+
 PV = "0.6.0+svnr${SRCREV}"
 
 inherit setuptools
 
+DISTUTILS_INSTALL_ARGS = "--root=${D} \
+    --prefix=${prefix} \
+    --install-data=${datadir}"
+
 SRC_URI = "svn://coherence.beebits.net/svn/trunk;module=Coherence;proto=https"
 S = "${WORKDIR}/Coherence"
 
 FILES_${PN} += "${datadir}"
 RDEPENDS_${PN} += "python-twisted-pair python-divmodepsilon python-nevow python-gst python-dbus \
-	python-configobj python-twisted python-twisted-core python-misc python-zopeinterface \
-	zope python-modules python-pygobject python-gdata python-inotify"
+	python-configobj python-twisted python-twisted-core python-twisted-protocols python-misc \
+	python-zopeinterface zope python-modules python-pygobject python-gdata python-inotify"
 
 
diff --git a/packages/python/python-divmodaxiom_0.5.30.bb b/packages/python/python-divmodaxiom_0.5.30.bb
new file mode 100644
index 0000000000..94c8a5317b
--- /dev/null
+++ b/packages/python/python-divmodaxiom_0.5.30.bb
@@ -0,0 +1,8 @@
+DESCRIPTION = "An object oriented database"
+LICENSE = "MIT"
+
+REALPN = "Axiom"
+
+DEPENDS += "python-divmodepsilon-native"
+
+require divmod.inc
diff --git a/packages/python/python-divmodepsilon-native_0.5.11.bb b/packages/python/python-divmodepsilon-native_0.5.11.bb
new file mode 100644
index 0000000000..185708b611
--- /dev/null
+++ b/packages/python/python-divmodepsilon-native_0.5.11.bb
@@ -0,0 +1,11 @@
+require python-divmodepsilon_${PV}.bb
+inherit native
+
+DEPENDS = "python-native python-twisted-native zope-native"
+
+do_stage() {
+    BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+    STAGING_LIBDIR=${STAGING_LIBDIR} STAGING_INCDIR=${STAGING_INCDIR} \
+        ${STAGING_BINDIR}/python setup.py install --prefix=${STAGING_BINDIR}/.. --install-data=${STAGING_DATADIR}
+}
+
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97807cc279..9a9e385cfa 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Openmoko: Misc. Feed Items"
 SECTION = "openmoko/base"
 LICENSE = "MIT"
-PR = "r60"
+PR = "r61"
 
 inherit task
 
@@ -29,7 +29,8 @@ RDEPENDS_task-openmoko-feed = "\
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial python-gst python-pygame \
-  python-lightblue python-pybluez \
+#  python-lightblue \
+  python-pybluez \
   obexpush \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
diff --git a/packages/vlc/vlc.inc b/packages/vlc/vlc.inc
index 30c22f800d..511d22675e 100644
--- a/packages/vlc/vlc.inc
+++ b/packages/vlc/vlc.inc
@@ -30,6 +30,7 @@ EXTRA_OECONF = "\
 	--enable-hal \	
 	--without-contrib \
 	--disable-opengl --disable-glx \
+	--enable-realrtsp \
 	ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
 	ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
 	ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
diff --git a/packages/vlc/vlc_0.9.8a.bb b/packages/vlc/vlc_0.9.8a.bb
index f98e909926..6127579b67 100644
--- a/packages/vlc/vlc_0.9.8a.bb
+++ b/packages/vlc/vlc_0.9.8a.bb
@@ -5,7 +5,7 @@
 
 require vlc.inc
 
-PR = "r2"
+PR = "r3"
 
 # ffmpeg from git (library version => 52) is required
 # libtool-native must be >= 2.2.4
diff --git a/packages/zope/zope-native_3.3.1.bb b/packages/zope/zope-native_3.3.1.bb
new file mode 100644
index 0000000000..970df6d785
--- /dev/null
+++ b/packages/zope/zope-native_3.3.1.bb
@@ -0,0 +1,10 @@
+require zope_${PV}.bb
+inherit native
+
+DEPENDS = "python-native"
+
+inherit distutils-base
+
+export BUILD_SYS
+export HOST_SYS
+
diff --git a/packages/zope/zope_3.3.1.bb b/packages/zope/zope_3.3.1.bb
index 78cf439e68..cd854250b6 100644
--- a/packages/zope/zope_3.3.1.bb
+++ b/packages/zope/zope_3.3.1.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 DEPENDS = "python"
 RDEPENDS = "python-core python-shell"
 LICENSE = "ZPL"
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://www.zope.org/Products/Zope3/${PV}/Zope-${PV}.tgz"
 S = "${WORKDIR}/Zope-${PV}"
@@ -23,6 +23,8 @@ do_install() {
 	install -d ${D}${libdir}/${PYTHON_DIR}
 	oe_runmake install prefix=${D}${prefix} HOST_SYS=${HOST_SYS} BUILD_SYS=${BUILD_SYS}
 	mv ${D}${libdir}/python/* ${D}${libdir}/${PYTHON_DIR} 
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/twisted
+	rm -rf ${D}${libdir}/${PYTHON_DIR}/zope/app/twisted
 }
 
 PACKAGES =+ "python-zopeinterface python-zopeinterface-dbg"
@@ -42,3 +44,4 @@ ${libdir}/${PYTHON_DIR}/ZODB/.debug"
 FILES_python-zopeinterface-dbg += "${libdir}/${PYTHON_DIR}/zope/interface/.debug "
 
 FILES_python-zopeinterface = "${libdir}/${PYTHON_DIR}/zope/interface/*.* ${libdir}/${PYTHON_DIR}/zope/interface/common"
+