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

25 files changed, 115 insertions, 168 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 121d403247..f7745e1ee3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -171,10 +171,10 @@ Recipes:    altboot, webcam-server
 
 Person:     Michael 'Mickey' Lauer
 Mail:       mlauer@vanille-media.de
-Distros:    Openmoko, Ångström, Generic
-Machines:   om-gta01, om-gta02, nokia810, x86, qemuarm, qemux86
-Interests:  Core OE infrastructure, everything Python, EFL
-Recipes:    efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*
+Distros:    Openmoko, Ångström, Minimal
+Machines:   om-gta01, om-gta02, om-gta03, htcraphael, a780, a1200, a910
+Interests:  Core OE infrastructure, everything Python, EFL, Vala, Freesmartphone.org
+Recipes:    efl1/*, busybox/*, dbus/*, dropbear/*, freesmartphone/*, gstreamer/*, *python*, vala/
 
 Person:     Patrick Gfeller
 Mail:       gfellerpatrik@gmx.net
diff --git a/conf/checksums.ini b/conf/checksums.ini
index 5bb4213540..5efcecf298 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1,4 +1,4 @@
-[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
+[?1034h[http://www.directfb.org/downloads/Extras/++DFB-0.9.25.tar.gz]
 md5=c6a2705f6210d8ede50a947b375f1c0b
 sha256=b3dbf01563dd60d63cff543ea8cd0c885381e78ecbbab8ff176e46df3f198a88
 
@@ -4542,6 +4542,10 @@ sha256=39999c5bfb663404f6450da66d98d69193a5d0ab496d2d47cc53cd0202c4051c
 md5=95d900913bee4b27d7e9ce55f8a55427
 sha256=8daa89512f9349fc131d48555726ffe1187e0f7d9f4cef992464c8098d86e77c
 
+[http://matt.ucc.asn.au/dropbear/dropbear-0.52.tar.bz2]
+md5=a1fc7adf601bca53330a792a9c873439
+sha256=8c7b727a4c9066e90a14f7f01c47cab698afb5a854ffa0404da162d4286f04c1
+
 [http://www.monkey.org/~dugsong/dsniff/dsniff-2.3.tar.gz]
 md5=183e336a45e38013f3af840bddec44b4
 sha256=82e492455486e655c315f027d393dbeb49ad930804acccdc51b30d57e1294ff5
@@ -10486,6 +10490,10 @@ sha256=915ee6c4b8f1ffd5313d990875cd44e5e7092a51de259707daca797fd5c42b46
 md5=7965d33e47a7cc97c4084c2e9aa0bf82
 sha256=bc4f62cbac4716c2c1a25cf53b73343a03883964576d9dd590a9e4c7a70f465a
 
+[http://downloads.sourceforge.net/juce/juce_1_46.zip]
+md5=a746183ea41aebc27a0f771036f668e1
+sha256=1b8f50169bc2d827c6efe6bc98bbef2161f615219e4e8921e68227888fd50a9e
+
 [http://downloads.sourceforge.net/junit/junit-4.3.1-src.jar]
 md5=170f9645a41398388e8553b32ff5f630
 sha256=57d1e49ee3fd0dbdc0a68a852925c973af5c30b1725b6aa63bfb42df6f7c3349
@@ -11626,6 +11634,10 @@ sha256=d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0
 md5=76596823cc1a6d1cdf7779b782ff0ee6
 sha256=39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0
 
+[http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.13.tar.gz]
+md5=ae9113fcd825d5a7f07e5ddccb3c3102
+sha256=bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709
+
 [http://0pointer.de/lennart/projects/libdaemon/libdaemon-0.6.tar.gz]
 md5=5b83dd22fd72130cc4fdd46bd1a7fe8a
 sha256=1f918fc7c51e8de4b97aa3556b829a03ef7a06bd44c344a494326dc222785a6a
@@ -21798,6 +21810,10 @@ sha256=a1cef2b1f56c46cf787af855c43468ff7dcb4acd4e253c85e302cd8bd37dbbac
 md5=c4e3d285ffacd6c5971788215588420b
 sha256=7f2f0492b0e1f9f96bd416e6c7a34e77c46faa20eeaff28c81c5932c91534ffc
 
+[http://download.gnome.org/sources/vala/0.5/vala-0.5.7.tar.bz2]
+md5=5e6c4ce07091725d9afdac7cf00e553c
+sha256=d0425be8572be85b8a7ae802a19bcb73fdeac74906f7bcbbc129697ea6a86f3a
+
 [http://www.valgrind.org/downloads/valgrind-3.2.1.tar.bz2]
 md5=9407d33961186814cef0e6ecedfd6318
 sha256=7f9a15d7be16ca03a0912191e8d55a486bf69690e11bb76ccece3eaff3730a33
diff --git a/contrib/angstrom/build-feeds.sh b/contrib/angstrom/build-feeds.sh
index 3160f80a6d..22f39f8fc7 100755
--- a/contrib/angstrom/build-feeds.sh
+++ b/contrib/angstrom/build-feeds.sh
@@ -83,6 +83,7 @@ do
                       bonjour \
                       camera-assistant \
                       cdparanoia \
+                      cdstatus \
                       checkers \
                       cherokee \
                       claws-mail \
diff --git a/contrib/angstrom/build-release.sh b/contrib/angstrom/build-release.sh
index 62d4e1ec0c..1cbb1e2a70 100755
--- a/contrib/angstrom/build-release.sh
+++ b/contrib/angstrom/build-release.sh
@@ -77,7 +77,7 @@ do
 done	 
 
 # build kexecboot kernels for supported machines
-for machine in h2200 hx4700 c7x0 akita spitz poodle collie
+for machine in h2200 hx4700 c7x0 akita spitz poodle collie tosa
 do
 	BUILD_MACHINE=$machine
 	BUILD_TARGETS="linux-kexecboot"
diff --git a/packages/apache2/apache2-native_2.2.3.bb b/packages/apache2/apache2-native_2.2.3.bb
index 73f9b8baec..3ea987c718 100644
--- a/packages/apache2/apache2-native_2.2.3.bb
+++ b/packages/apache2/apache2-native_2.2.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
 
 inherit native 
 
-PR ="r9"
+PR ="r10"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
@@ -20,25 +20,20 @@ do_stage () {
 	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
 	cp support/apxs ${STAGING_BINDIR_NATIVE}
 	chmod 755 ${STAGING_BINDIR_NATIVE}/apxs
-	mkdir -p ${STAGING_DIR}/build
-	cp build/*.mk ${STAGING_DIR}/build
-	cat build/config_vars.mk | \
-		sed -e '/^prefix/s,staging,staging/${HOST_SYS},' | \
-		sed -e '/^includedir/s,/include,/include/apache2,' | \
-		sed -e 's,staging/bin,staging/${HOST_SYS}/bin,' > \
-			${STAGING_DIR}/build/config_vars.mk
-	cp build/instdso.sh ${STAGING_DIR}/build
+	mkdir -p ${STAGING_DIR_NATIVE}//usr/build
+	cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build
+	cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build
 	cp .libs/httpd ${STAGING_BINDIR_NATIVE}
 
 	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
-	  (cd ${STAGING_LIBDIR}; tar -xf - )
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
 	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
-	  (cd ${STAGING_LIBDIR}; tar -xf - )
+	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
 
-    	mkdir -p ${STAGING_INCDIR}/apache2
-    	cp include/* ${STAGING_INCDIR}/apache2
-	cp os/unix/os.h ${STAGING_INCDIR}/apache2
-	cp os/unix/unixd.h ${STAGING_INCDIR}/apache2
+	mkdir -p ${STAGING_INCDIR_NATIVE}/apache2
+	cp include/* ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2
+	cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2
 
   	cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars
     	chmod 755 ${STAGING_BINDIR_NATIVE}/envvars
diff --git a/packages/dsplink/files/dsplink-add-class-device-create-support.patch b/packages/dsplink/files/dsplink-add-class-device-create-support.patch
new file mode 100644
index 0000000000..b43c3481e1
--- /dev/null
+++ b/packages/dsplink/files/dsplink-add-class-device-create-support.patch
@@ -0,0 +1,55 @@
+diff -uNr codec_engine_2_21/cetools/packages/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c codec_engine_2_21_fix/cetools/packages/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c 
+--- codec_engine_2_21/cetools/packages/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c	2008-10-24 20:58:01.000000000 +0100
++++ codec_engine_2_21_fix/cetools/packages/dsplink/gpp/src/pmgr/Linux/2.6.18/drv_pmgr.c	2009-02-20 23:46:42.000000000 +0000
+@@ -37,6 +37,10 @@
+ #endif

+ 

+ /*  ----------------------------------- OS Specific Headers         */

++#include <linux/version.h>

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

++#include <linux/device.h>

++#endif

+ #include <linux/autoconf.h>

+ #include <linux/spinlock.h>

+ #include <linux/module.h>

+@@ -190,6 +194,16 @@
+  */

+ STATIC Int32 major = 230 ;

+ 

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

++/** ----------------------------------------------------------------------------

++ *  @name   dsplink_class

++ *

++ *  @desc   class struct for device create.

++ *  ----------------------------------------------------------------------------

++ */

++STATIC struct class *dsplink_class;

++#endif

++

+ /** ----------------------------------------------------------------------------

+  *  @name   DRV_IsInitialized

+  *

+@@ -673,6 +687,11 @@
+         }

+ #endif /* if defined (CHNL_COMPONENT) */

+ 

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

++        dsplink_class = class_create(THIS_MODULE, "dsplink");

++        device_create(dsplink_class, NULL, MKDEV(major, 0), NULL, "dsplink");

++#endif

++

+         if (DSP_SUCCEEDED (status)) {

+             DRV_IsInitialized = TRUE ;

+         }

+@@ -717,6 +736,11 @@
+     }

+ #endif /* if defined (CHNL_COMPONENT) */

+ 

++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)

++    device_destroy(dsplink_class, MKDEV(major, 0));

++    class_destroy(dsplink_class);

++#endif

++

+     unregister_chrdev (major, "dsplink") ;

+ 

+     DRV_IsInitialized = FALSE ;

diff --git a/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh
index 743a07ebba..9f9233d12b 100755
--- a/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh
+++ b/packages/dsplink/files/loadmodules-ti-codec-engine-apps.sh
@@ -29,8 +29,8 @@ modprobe cmemk phys_start=0x85000000 phys_end=0x86000000 pools=20x4096,8x131072,
 modprobe dsplinkk
 
 # make /dev/dsplink
-rm -f /dev/dsplink
-mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
+#rm -f /dev/dsplink
+#mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
 
 # insert Local Power Manager driver
 #
diff --git a/packages/dsplink/files/loadmodules-ti-dmai-apps.sh b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh
index af4cef9f3f..7120b74483 100755
--- a/packages/dsplink/files/loadmodules-ti-dmai-apps.sh
+++ b/packages/dsplink/files/loadmodules-ti-dmai-apps.sh
@@ -29,8 +29,8 @@ modprobe cmemk phys_start=0x85800000 phys_end=0x86800000 pools=20x4096,8x131072,
 modprobe dsplinkk
 
 # make /dev/dsplink
-rm -f /dev/dsplink
-mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
+#rm -f /dev/dsplink
+#mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
 
 # insert Local Power Manager driver
 #
diff --git a/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh
index c93b637867..9cfb19d5c1 100755
--- a/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh
+++ b/packages/dsplink/files/loadmodules-ti-dsplink-apps.sh
@@ -21,5 +21,5 @@ awk '/MemTotal:/ {
 modprobe dsplinkk
 
 # make /dev/dsplink
-rm -f /dev/dsplink
-mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
+#rm -f /dev/dsplink
+#mknod /dev/dsplink c `awk "\\$2==\"dsplink\" {print \\$1}" /proc/devices` 0
diff --git a/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh
index 17436a5937..f990d99771 100755
--- a/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh
+++ b/packages/dsplink/files/unloadmodules-ti-codec-engine-apps.sh
@@ -5,7 +5,7 @@ rmmod lpm_omap3530
 
 # remove DSP/BIOS Link driver
 rmmod dsplinkk
-rm -f /dev/dsplink
+#rm -f /dev/dsplink
 
 # remove cmem module
 rmmod cmemk
diff --git a/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh
index 2465c43fe9..793d727f39 100755
--- a/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh
+++ b/packages/dsplink/files/unloadmodules-ti-dmai-apps.sh
@@ -5,7 +5,7 @@ rmmod lpm_omap3530
 
 # remove DSP/BIOS Link driver
 rmmod dsplinkk
-rm -f /dev/dsplink
+#rm -f /dev/dsplink
 
 # remove cmem module
 rmmod cmemk
diff --git a/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh
index 8694114a70..48fa84b03d 100755
--- a/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh
+++ b/packages/dsplink/files/unloadmodules-ti-dsplink-apps.sh
@@ -2,4 +2,4 @@
 
 # remove DSP/BIOS Link driver
 rmmod dsplinkk
-rm -f /dev/dsplink
+#rm -f /dev/dsplink
diff --git a/packages/dsplink/ti-codec-engine_2.21.bb b/packages/dsplink/ti-codec-engine_2.21.bb
index c2055c1495..607cbd06ee 100644
--- a/packages/dsplink/ti-codec-engine_2.21.bb
+++ b/packages/dsplink/ti-codec-engine_2.21.bb
@@ -8,7 +8,7 @@ RDEPENDS = "update-modules"
 inherit module
 
 # tconf from xdctools dislikes '.' in pwd :/
-PR = "r15"
+PR = "r16"
 PV = "221"
 
 # Get CE tarball from TI website, place in sources and calculate
@@ -19,6 +19,7 @@ SRC_URI = "http://install.tarball.in.source.dir/codec_engine_2_21.tar.gz \
            file://cmem-class-device-27-and-sched-include-fix.patch;patch=1 \
            file://sdma-class-device-and-includes-fix.patch;patch=1 \
            file://dsplink-semaphore-27.patch;patch=1 \
+           file://dsplink-add-class-device-create-support.patch;patch=1 \
            file://lpm-device-create-and-semaphore-include-fix.patch;patch=1 \
            file://lpm-make-symbol-warnings-fix.patch;patch=1 \
            file://Makefile-dsplink-gpp \
diff --git a/packages/libdaemon/libdaemon_0.10.bb b/packages/libdaemon/libdaemon_0.10.bb
deleted file mode 100644
index ba7140ffdb..0000000000
--- a/packages/libdaemon/libdaemon_0.10.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
-SECTION = "libs"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
-LICENSE = "LGPL"
-PR = "r1"
-
-SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-lynx --disable-doxygen"
-
-do_stage () {
-	oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libdaemon
-	for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
-		install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/
-	done
-}
diff --git a/packages/libdaemon/libdaemon_0.11.bb b/packages/libdaemon/libdaemon_0.11.bb
deleted file mode 100644
index c91f6351ff..0000000000
--- a/packages/libdaemon/libdaemon_0.11.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
-SECTION = "libs"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-lynx --disable-doxygen"
-
-do_stage () {
-	oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libdaemon
-	for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
-		install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/
-	done
-}
diff --git a/packages/libdaemon/libdaemon_0.12.bb b/packages/libdaemon/libdaemon_0.12.bb
deleted file mode 100644
index c91f6351ff..0000000000
--- a/packages/libdaemon/libdaemon_0.12.bb
+++ /dev/null
@@ -1,20 +0,0 @@
-DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
-SECTION = "libs"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
-LICENSE = "LGPL"
-PR = "r0"
-
-SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-lynx --disable-doxygen"
-
-do_stage () {
-	oe_libinstall -a -so -C libdaemon libdaemon ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libdaemon
-	for i in daemon.h dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
-		install -m 0644 ${S}/libdaemon/$i ${STAGING_INCDIR}/libdaemon/
-	done
-}
diff --git a/packages/libdaemon/libdaemon_0.13.bb b/packages/libdaemon/libdaemon_0.13.bb
new file mode 100644
index 0000000000..3a6b2051d5
--- /dev/null
+++ b/packages/libdaemon/libdaemon_0.13.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "libdaemon is a lightweight C library that eases the writing of UNIX daemons."
+SECTION = "libs"
+AUTHOR = "Lennart Poettering <lennart@poettering.net>"
+HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
+LICENSE = "LGPL"
+PR = "r0"
+
+SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
+
+inherit autotools_stage pkgconfig
+
+EXTRA_OECONF = "--disable-lynx --disable-doxygen"
diff --git a/packages/libdaemon/libdaemon_0.6.bb b/packages/libdaemon/libdaemon_0.6.bb
deleted file mode 100644
index bdf52503c0..0000000000
--- a/packages/libdaemon/libdaemon_0.6.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-DESCRIPTION = "libdaemon is a lightweight C library which eases the writing of UNIX daemons."
-SECTION = "libs"
-AUTHOR = "Lennart Poettering <lennart@poettering.net>"
-HOMEPAGE = "http://0pointer.de/lennart/projects/libdaemon/"
-LICENSE = "GPLv2"
-
-SRC_URI = "http://0pointer.de/lennart/projects/libdaemon/libdaemon-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-lynx --disable-doxygen"
-
-do_stage () {
-	oe_libinstall -a -so -C src libdaemon ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/libdaemon
-	for i in dlog.h dexec.h dfork.h dsignal.h dnonblock.h dpid.h; do
-		install -m 0644 ${S}/src/$i ${STAGING_INCDIR}/libdaemon/
-	done
-}
diff --git a/packages/modphp/modphp5.inc b/packages/modphp/modphp5.inc
index e8701b0b99..3aaaf03e62 100644
--- a/packages/modphp/modphp5.inc
+++ b/packages/modphp/modphp5.inc
@@ -13,7 +13,8 @@ inherit autotools
 FILES_${PN} = "${libdir}/apache2 /etc"
 FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug"
 
-CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED"
+CFLAGS += " -g -DPTYS_ARE_GETPT -DPTYS_ARE_SEARCHED -I${STAGING_INCDIR_NATIVE}/apache2"
+
 EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \
                 --without-mysql \
 		--enable-force-cgi-redirect \
@@ -29,7 +30,7 @@ EXTRA_OECONF = "--with-apxs2=${STAGING_BINDIR_NATIVE}/apxs \
 		--disable-simplexml \
 		--disable-libxml \
 		--disable-dom \
-                --with-zlib --with-zlib-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
+                --with-zlib --with-zlib-dir=${STAGING_DIR}${layout_exec_prefix}/.. \
                 --with-config-file-path=/etc/php/apache2-php5"
 
 #		--with-libxml-dir=${STAGING_DIR_NATIVE}${layout_exec_prefix} \
diff --git a/packages/modphp/modphp_5.1.6.bb b/packages/modphp/modphp_5.1.6.bb
index 7c421c1d0f..70a578cd0a 100644
--- a/packages/modphp/modphp_5.1.6.bb
+++ b/packages/modphp/modphp_5.1.6.bb
@@ -1,2 +1,2 @@
 include modphp5.inc
-PR ='r2'
+PR ='r3'
diff --git a/packages/vala/files/0001-glib-2.0.vapi-add-necessary-struct-members-to-use-B.patch b/packages/vala/files/0001-glib-2.0.vapi-add-necessary-struct-members-to-use-B.patch
deleted file mode 100644
index 46b9cf7fa9..0000000000
--- a/packages/vala/files/0001-glib-2.0.vapi-add-necessary-struct-members-to-use-B.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From c0f61469875c232727bab3b63f239f0e9122520c Mon Sep 17 00:00:00 2001
-From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-Date: Thu, 19 Feb 2009 17:40:13 +0100
-Subject: [PATCH] glib-2.0.vapi: add necessary struct members to use ByteArray class
-
-Signed-Off: Michael 'Mickey' Lauer <mickey@vanille-media.de>
----
- vapi/glib-2.0.vapi |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
-diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
-index 5faee07..26b73e7 100644
---- a/vapi/glib-2.0.vapi
-+++ b/vapi/glib-2.0.vapi
-@@ -3144,6 +3144,9 @@ namespace GLib {
- 		public void sort (CompareFunc compare_func);
- 		public void sort_with_data (CompareDataFunc compare_func);
- 		public void set_size (uint length);
-+
-+		public uint len;
-+		public uint8[] data;
- 	}
- 
- 	/* N-ary Trees */
--- 
-1.6.0.2
-
diff --git a/packages/vala/files/0002-glib-2.0-bind-g_io_channel_add_watch_full.patch b/packages/vala/files/0002-glib-2.0-bind-g_io_channel_add_watch_full.patch
deleted file mode 100644
index de03f288bc..0000000000
--- a/packages/vala/files/0002-glib-2.0-bind-g_io_channel_add_watch_full.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From ec0865757033416b3ca1d4d046c4308d59aadf85 Mon Sep 17 00:00:00 2001
-From: Michael 'Mickey' Lauer <mickey@vanille-media.de>
-Date: Thu, 19 Feb 2009 17:52:10 +0100
-Subject: [PATCH] glib-2.0: bind g_io_channel_add_watch_full
-
-Signed-Off: Michael 'Mickey' Lauer <mlauer@vanille-media.de>
----
- vapi/glib-2.0.vapi |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
-index 26b73e7..24c3c93 100644
---- a/vapi/glib-2.0.vapi
-+++ b/vapi/glib-2.0.vapi
-@@ -1443,6 +1443,8 @@ namespace GLib {
- 		public GLib.Source create_watch (IOCondition condition);
- 		[CCode (cname = "g_io_add_watch")]
- 		public uint add_watch (IOCondition condition, IOFunc func);
-+		[CCode (cname = "g_io_add_watch_full")]
-+		public uint add_watch_full (int priority, IOCondition condition, IOFunc func, DestroyNotify? notify);
- 		public size_t get_buffer_size ();
- 		public void set_buffer_size (size_t size);
- 		public IOCondition get_buffer_condition ();
--- 
-1.6.0.2
-
diff --git a/packages/vala/vala-native_0.5.6.bb b/packages/vala/vala-native_0.5.7.bb
index bc99ebf0a6..bc99ebf0a6 100644
--- a/packages/vala/vala-native_0.5.6.bb
+++ b/packages/vala/vala-native_0.5.7.bb
diff --git a/packages/vala/vala.inc b/packages/vala/vala.inc
index 422571ca8f..f5ea1ee520 100644
--- a/packages/vala/vala.inc
+++ b/packages/vala/vala.inc
@@ -9,8 +9,6 @@ MAJV = "${@bb.data.getVar('PV',d,1)[:3]}"
 
 SRC_URI = "\
   http://download.gnome.org/sources/vala/${MAJV}/vala-${PV}.tar.bz2 \
-  file://0001-glib-2.0.vapi-add-necessary-struct-members-to-use-B.patch;patch=1 \
-  file://0002-glib-2.0-bind-g_io_channel_add_watch_full.patch;patch=1 \
   file://static-dbus-methods.patch;patch=1 \
 "
 S = "${WORKDIR}/vala-${PV}"
diff --git a/packages/vala/vala_0.5.6.bb b/packages/vala/vala_0.5.7.bb
index 7b2b4e293c..7b2b4e293c 100644
--- a/packages/vala/vala_0.5.6.bb
+++ b/packages/vala/vala_0.5.7.bb