Merge remote branch 'origin/org.openembedded.dev' into shr/unstable

Conflicts:
	recipes/freesmartphone/fsodatad_git.bb
	recipes/freesmartphone/fsodeviced_git.bb
	recipes/linux/linux-openmoko-2.6.24_git.bb
	recipes/linux/linux-openmoko-2.6.28_git.bb
	recipes/linux/linux-openmoko-devel_git.bb
	recipes/xorg-lib/pixman_git.bb
	recipes/xorg-xserver/xserver-xorg_git.bb

51 files changed, 642 insertions, 78 deletions

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 20403eaba8..7504c119ad 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -132,10 +132,11 @@ kernel_do_install() {
 		cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/
 	fi
 
-	cp -fR include/$ASMDIR/* $kerneldir/include/$ASMDIR/
 	# Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm	
 	if [ -e arch/${ARCH}/include/asm/ ] ; then 
-		cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/
+		if [ -e include/asm ] ; then
+			cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/
+		fi
 		install -d $kerneldir/arch/${ARCH}/include
 		cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/	
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 47468ebcdc..74d4da238e 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -579,6 +579,16 @@ SRCREV = "1"
 SRCPV = "${@bb.fetch.get_srcrev(d)}"
 AUTOREV = "${SRCPV}"
 
+# For now disable autoincrement of revision counter in SRCPV, whoever wants it, should enable it in local.conf or distro config
+# Revision counter is incremented only locally (bad for multiple builders filling shared feeds), LOCALCOUNT can be used to maintain
+# counter globally in OE metadata (LOCALCOUNT value set in recipe).
+# Make sure you disable it, if you want always upgradable paths for git recipes without bumping LOCALCOUNT with every SRCREV change
+# or if you're using AUTOREV feature.
+BB_LOCALCOUNT_OVERRIDE = "1"
+
+# Value for revision counter in GIT recipes (NNNN in PV="1.0+gitrNNNN+a7401084a72285c8d3485bacf4eed593f303b1b7-r4.4")
+LOCALCOUNT = "0"
+
 SRC_URI = "file://${FILE}"
 
 ##################################################################
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index db15a4d1c2..7edc6af465 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -15,6 +15,7 @@ TOOLCHAIN_BRAND ?= ""
 
 #LIBC = "glibc"
 
+BB_LOCALCOUNT_OVERRIDE = ""
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
 
diff --git a/conf/machine/smartq5.conf b/conf/machine/smartq5.conf
new file mode 100644
index 0000000000..f116d339c5
--- /dev/null
+++ b/conf/machine/smartq5.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@Name: Smartdevices SmartQ5
+#@DESCRIPTION: Machine configuration for Smartdevices SmartQ5
+
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-video-fbdev \
+           xf86-input-keyboard \
+           xf86-input-mouse \
+"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+MACHINE_KERNEL_PR = "r1"
+KERNEL_IMAGETYPE = "zImage"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttySAC0"
+
+IMAGE_FSTYPES = "tar.gz"
+
+MACHINE_FEATURES = "kernel26 apm screen alsa usbgadget usbhost"
+
+require conf/machine/include/tune-arm1176jzf-s.inc
diff --git a/recipes/chromium/chromium_svn.bb b/recipes/chromium/chromium_svn.bb
index 9387573c56..c6b9565b02 100644
--- a/recipes/chromium/chromium_svn.bb
+++ b/recipes/chromium/chromium_svn.bb
@@ -5,6 +5,7 @@ DEPENDS = "xextproto cairo nss"
 
 SRCREV = "34027"
 PV = "0.1+svnr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http \
            git://git.chromium.org/cros.git;protocol=git;rev=07f1fc0ce7a4bbd57f6b057435ad86f0a98e073d\
diff --git a/recipes/evtest/evtest_1.23.bb b/recipes/evtest/evtest_1.23.bb
deleted file mode 100644
index a44918c50b..0000000000
--- a/recipes/evtest/evtest_1.23.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 2009 Khem Raj <raj.khem@gmail.com>
-# Released under the MIT license (see COPYING.MIT for the terms)
-
-DESCRIPTION = "Event device test program"
-AUTHOR = "Vojtech Pavlik <vojtech@suse.cz>"
-SECTION = "console/utils"
-PRIORITY = "optional"
-LICENSE = "GPLv2"
-PR = "r0"
-
-SRC_URI = "http://beagleboard.googlecode.com/files/evtest.c"
-S = "${WORKDIR}"
-
-TARGET_CC_ARCH += "${LDFLAGS}"
-
-do_compile() {
-    ${CC} evtest.c -o evtest -I${STAGING_INCDIR} -L${STAGING_LIBDIR}
-}
-
-do_install() {
-    install -d ${D}${bindir}
-    install -m 0755 evtest ${D}${bindir}
-}
-
-SRC_URI[md5sum] = "da26fda6df8835a7cb95182e1fabe912"
-SRC_URI[sha256sum] = "ba2bdf6887eb0ef606402d51a2f4e68510d68dec5afd9f4d30d787950dece770"
diff --git a/recipes/evtest/evtest_1.25.bb b/recipes/evtest/evtest_1.25.bb
new file mode 100644
index 0000000000..55de6cb2e1
--- /dev/null
+++ b/recipes/evtest/evtest_1.25.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Simple tool for input event debugging."
+HOMEPAGE = "http://people.freedesktop.org/~whot/evtest/"
+AUTHOR = "Vojtech Pavlik <vojtech@suse.cz>"
+SECTION = "console/utils"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+PR = "r0"
+
+SRC_URI = "http://cgit.freedesktop.org/~whot/evtest/snapshot/evtest-${PV}.tar.bz2;name=archive"
+SRC_URI[archive.md5sum] = "770d6af03affe976bdbe3ad1a922c973"
+SRC_URI[archive.sha256sum] = "3d34123c68014dae6f7c19144ef79ea2915fa7a2f89ea35ca375a9cf9e191473"
+
+inherit autotools
diff --git a/recipes/freesmartphone/fso-boot_git.bb b/recipes/freesmartphone/fso-boot_git.bb
index 48280ae571..3241ce524f 100644
--- a/recipes/freesmartphone/fso-boot_git.bb
+++ b/recipes/freesmartphone/fso-boot_git.bb
@@ -1,6 +1,7 @@
 require cornucopia.inc
 inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
+PE = "1"
 PR = "${INC_PR}.0"
 PV = "0.2.0+gitr${SRCPV}"
 S = "${WORKDIR}/git/tools/${PN}"
diff --git a/recipes/freesmartphone/fsodatad_git.bb b/recipes/freesmartphone/fsodatad_git.bb
index bc8ca17bc8..9892e12e39 100644
--- a/recipes/freesmartphone/fsodatad_git.bb
+++ b/recipes/freesmartphone/fsodatad_git.bb
@@ -3,6 +3,7 @@ inherit fso-plugin
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PR = "${INC_PR}.2"
 PV = "0.1.0+gitr${SRCPV}"
+PE = "1"
 
 DEPENDS += "\
   libxml2 \
diff --git a/recipes/freesmartphone/fsodeviced_git.bb b/recipes/freesmartphone/fsodeviced_git.bb
index c567ab9b27..90eb91c101 100644
--- a/recipes/freesmartphone/fsodeviced_git.bb
+++ b/recipes/freesmartphone/fsodeviced_git.bb
@@ -8,7 +8,7 @@ RDEPENDS += "libcanberra-alsa"
 RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.9.0+gitr${SRCPV}"
-PE = "1"
+PE = "2"
 PR = "${INC_PR}.10"
 
 EXTRA_OECONF = "\
diff --git a/recipes/freesmartphone/fsomusicd_git.bb b/recipes/freesmartphone/fsomusicd_git.bb
index 6d3a398588..2d1de2b56f 100644
--- a/recipes/freesmartphone/fsomusicd_git.bb
+++ b/recipes/freesmartphone/fsomusicd_git.bb
@@ -8,6 +8,7 @@ DEPENDS += "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ${@base_
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "0.0.1+gitr${SRCPV}"
 PR = "${INC_PR}.3"
+PE = "1"
 
 RDEPENDS += "\
 #gst-plugins-base
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index 3ce881c14e..76af519d4b 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -7,6 +7,7 @@ DEPENDS = "glib-2.0 dbus dbus-glib"
 SRCREV = "${FSO_CORNUCOPIA_SRCREV}"
 PV = "2.0.0+gitr${SRCPV}"
 PR = "r0"
+PE = "1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
 S = "${WORKDIR}/git/tools/mdbus2"
diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb
index 0f19ad87cf..7177e50fc1 100644
--- a/recipes/freesmartphone/msmcommd_git.bb
+++ b/recipes/freesmartphone/msmcommd_git.bb
@@ -7,6 +7,7 @@ DEPENDS = "libgee libfsotransport"
 SRCREV = "23c0cd870fc989792a20c6c662db4400129bd471"
 PV = "0.1.0+gitr${SRCPV}"
 PR = "r2"
+PE = "1"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb
index 14d7097beb..11402b4649 100644
--- a/recipes/freesmartphone/zhone2_git.bb
+++ b/recipes/freesmartphone/zhone2_git.bb
@@ -5,8 +5,9 @@ SECTION = "x11"
 LICENSE = "GPLv2"
 DEPENDS = "edje-native vala-native evas ecore edje libeflvala libfsobasics libfsoframework libfso-glib"
 SRCREV = "1e3dca8a407f4e69636c47d9f22b31f8ae718d5a"
-PV = "2.0.0+gitr${SRCREV}"
+PV = "2.0.0+gitr${SRCPV}"
 PR = "r2"
+PE = "1"
 
 SRC_URI = "\
   ${FREESMARTPHONE_GIT}/aurora.git;protocol=git;branch=master \
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/ARM-Add-support-for-LZMA-compressed-kernel-images.patch b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
index 6f5e00aa8e..6f5e00aa8e 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/ARM-Add-support-for-LZMA-compressed-kernel-images.patch
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/akita/defconfig
index 3d64d89557..b8a00112fd 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/akita/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/akita/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Thu Apr  8 00:56:38 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 02:11:48 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/c7x0/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/c7x0/defconfig
index 18cdbbcec3..0ea1211375 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/c7x0/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/c7x0/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Wed Apr  7 23:47:06 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 01:48:33 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/collie/defconfig
index a151952a5d..69455605d6 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/collie/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/collie/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Sat Apr 10 01:34:25 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 01:00:42 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -894,7 +894,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 # MMC/SD/SDIO Host Controller Drivers
 #
 # CONFIG_MMC_SDHCI is not set
-# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SPI=y
 # CONFIG_MEMSTICK is not set
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
@@ -1199,9 +1199,9 @@ CONFIG_GENERIC_FIND_LAST_BIT=y
 # CONFIG_CRC_CCITT is not set
 CONFIG_CRC16=y
 # CONFIG_CRC_T10DIF is not set
-# CONFIG_CRC_ITU_T is not set
+CONFIG_CRC_ITU_T=y
 CONFIG_CRC32=y
-# CONFIG_CRC7 is not set
+CONFIG_CRC7=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/poodle/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/poodle/defconfig
index 837c371ce1..5c00d5ef55 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/poodle/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/poodle/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Fri Apr  9 02:23:48 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 01:58:03 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -607,9 +607,9 @@ CONFIG_INPUT_KEYBOARD=y
 # CONFIG_KEYBOARD_CORGI is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_GPIO is not set
-CONFIG_KEYBOARD_MATRIX=y
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_LOCOMO is not set
+CONFIG_KEYBOARD_LOCOMO=y
 # CONFIG_KEYBOARD_MAX7359 is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_OPENCORES is not set
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/spitz/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/spitz/defconfig
index 3d64d89557..a080a055eb 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/spitz/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/spitz/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Thu Apr  8 00:56:38 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 02:23:04 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/tosa/defconfig
index 86cb45c9e8..9881af8bcd 100644
--- a/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc3/tosa/defconfig
+++ b/recipes/kexecboot/linux-kexecboot-2.6.33+2.6.34-rc4/tosa/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.34-rc3
-# Sat Apr 10 01:43:49 2010
+# Linux kernel version: 2.6.34-rc4
+# Sat Apr 17 02:36:51 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
diff --git a/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc3.bb b/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc4.bb
index 3bb3d595ac..665c8f76e1 100644
--- a/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc3.bb
+++ b/recipes/kexecboot/linux-kexecboot_2.6.33+2.6.34-rc4.bb
@@ -1,6 +1,6 @@
 require linux-kexecboot.inc
 
-KERNEL_RELEASE = "2.6.34-rc3"
+KERNEL_RELEASE = "2.6.34-rc4"
 OLD_KERNEL_RELEASE = "2.6.33"
 PV = "${OLD_KERNEL_RELEASE}+${KERNEL_RELEASE}"
 PR = "${INC_PR}.0"
@@ -18,5 +18,5 @@ SRC_URI += "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${OLD_KERNEL_RELEASE
 SRC_URI[kernel.md5sum] = "c3883760b18d50e8d78819c54d579b00"
 SRC_URI[kernel.sha256sum] = "63e237de3b3c4c46a21833b9ce7e20574548d52dabbd1a8bf376041e4455d5c6"
 
-SRC_URI[patch.md5sum] = "f8bf58920ee30d12c54e9326ef74af32"
-SRC_URI[patch.sha256sum] = "c53504b595db44d888fd01982006389e06b0f7f9d2ea2f6f5087e7f7e1acda8a"
+SRC_URI[patch.md5sum] = "c103b3168ad6128272c347f15822c77a"
+SRC_URI[patch.sha256sum] = "944e167133fe0be7215ff09cc690e5fd2a63e189d3b95ee22aa736043af22061"
diff --git a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig
index 2560965609..dce02acbc6 100644
--- a/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig
+++ b/recipes/linux/linux-omap-zoomsync-2.6.32/omapzoom2/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.32.7
-# Thu Mar 18 21:35:16 2010
+# Sun Apr 18 20:30:13 2010
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -312,7 +312,7 @@ CONFIG_ARM_THUMBEE=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
 CONFIG_ARM_L1_CACHE_SHIFT=6
-# CONFIG_ARM_ERRATA_430973 is not set
+CONFIG_ARM_ERRATA_430973=y
 # CONFIG_ARM_ERRATA_458693 is not set
 # CONFIG_ARM_ERRATA_460075 is not set
 CONFIG_COMMON_CLKDEV=y
diff --git a/recipes/linux/linux-omap-zoomsync_2.6.32.bb b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
index 4202c29bd0..b869a8881c 100644
--- a/recipes/linux/linux-omap-zoomsync_2.6.32.bb
+++ b/recipes/linux/linux-omap-zoomsync_2.6.32.bb
@@ -14,7 +14,7 @@ SRCREV_omapzoom2 = "015cbaf1035cd9a61d33a27de2a22902555db3c5"
 
 SRCREV_omapzoom36x = "2e3c681c6228de2a3f8fbb0cfbc940e7ea825a09"
 
-OEV = "oe5"
+OEV = "oe6"
 PE = "1"
 
 # The main PR is now using MACHINE_KERNEL_PR, for omap3 see conf/machine/include/omap3.inc
diff --git a/recipes/mozilla/nss-3.12.6/81_sonames.patch b/recipes/mozilla/nss-3.12.6/81_sonames.patch
index 5fceba3835..32fdca5c6c 100644
--- a/recipes/mozilla/nss-3.12.6/81_sonames.patch
+++ b/recipes/mozilla/nss-3.12.6/81_sonames.patch
@@ -309,7 +309,7 @@ index b3bbd97..a87a90c 100644
  
  LIBRARY_NAME = nss
  LIBRARY_VERSION = 3
-+SO_VERSION = 1d
++SO_VERSION = 1oe
  
  # This part of the code, including all sub-dirs, can be optimized for size
  export ALLOW_OPT_CODE_SIZE = 1
@@ -321,7 +321,7 @@ index a72b413..a782e1d 100644
  
  LIBRARY_NAME = smime
  LIBRARY_VERSION = 3
-+SO_VERSION = 1d
++SO_VERSION = 1oe
  
  # This part of the code, including all sub-dirs, can be optimized for size
  export ALLOW_OPT_CODE_SIZE = 1
@@ -333,7 +333,7 @@ index 8451229..ec3495e 100644
  
  LIBRARY_NAME = ssl
  LIBRARY_VERSION = 3
-+SO_VERSION = 1d
++SO_VERSION = 1oe
  
  # This part of the code, including all sub-dirs, can be optimized for size
  export ALLOW_OPT_CODE_SIZE = 1
@@ -345,7 +345,7 @@ index 74ddd92..30f530a 100644
  
  LIBRARY_NAME = nssutil
  LIBRARY_VERSION = 3
-+SO_VERSION = 1d
++SO_VERSION = 1oe
  
  # This part of the code, including all sub-dirs, can be optimized for size
  export ALLOW_OPT_CODE_SIZE = 1
diff --git a/recipes/mozilla/nss-3.12.6/nss.pc.in b/recipes/mozilla/nss-3.12.6/nss.pc.in
index e72ee5f913..84e4ef779d 100644
--- a/recipes/mozilla/nss-3.12.6/nss.pc.in
+++ b/recipes/mozilla/nss-3.12.6/nss.pc.in
@@ -7,5 +7,5 @@ Name: NSS
 Description: Mozilla Network Security Services
 Version: @VERSION@
 Requires: nspr
-Libs: -L${libdir}/nss -lnss3 -lnssutil3 -lsmime3 -lssl3 
+Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 
 Cflags: -I${includedir}
diff --git a/recipes/mozilla/nss_3.12.6.bb b/recipes/mozilla/nss_3.12.6.bb
index 7da316fb14..76ad318a7e 100644
--- a/recipes/mozilla/nss_3.12.6.bb
+++ b/recipes/mozilla/nss_3.12.6.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "Mozilla's SSL and TLS implementation"
 HOMEPAGE = "http://www.mozilla.org/projects/security/pki/nss/"
 
-PR = "r1"
+PR = "r2"
 
 LICENSE = "MPL1.1 GPL LGPL"
 
@@ -79,9 +79,10 @@ do_install() {
 
 	install -d ${D}/${libdir}/nss
 
-	for shared_lib in ${TD}/${libdir}/*.so
+	for shared_lib in ${TD}/${libdir}/*.so.*
 	do
-		cp $shared_lib ${D}/${libdir}/nss
+		cp $shared_lib ${D}/${libdir}
+		ln -sf $(basename $shared_lib) ${D}/${libdir}/$(basename $shared_lib .1oe)
 	done
 
 	install -d ${D}/${includedir}/mozilla/nss
@@ -89,7 +90,7 @@ do_install() {
 
 	for static_lib in ${TD}/${libdir}/*.a
 	do
-		oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir}/nss
+		oe_libinstall -C ${TD}/${libdir} `basename $static_lib .a` ${D}/${libdir}
 	done
 
 	install -d ${D}/${bindir}
@@ -103,5 +104,3 @@ do_install() {
 
 }
 
-FILES_${PN} = "${bindir} ${libdir}/nss/*.so"
-FILES_${PN}-static += "${libdir}/nss/*.a"
diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb
index be02984cbd..47a6ada62d 100644
--- a/recipes/musicpd/mpd-alsa_0.11.5.bb
+++ b/recipes/musicpd/mpd-alsa_0.11.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 RDEPENDS = "libao-alsa"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb
index adbf430e67..c9c71bb3ca 100644
--- a/recipes/musicpd/mpd-alsa_0.14.2.bb
+++ b/recipes/musicpd/mpd-alsa_0.14.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 file://mpd/mpd.conf \
 file://mpd/mpd.init"
 
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/mpd-${PV}"
 inherit autotools update-rc.d
diff --git a/recipes/musicpd/mpd/mpd.init b/recipes/musicpd/mpd/mpd.init
index 98a75d0af7..2820ce7add 100644
--- a/recipes/musicpd/mpd/mpd.init
+++ b/recipes/musicpd/mpd/mpd.init
@@ -19,9 +19,9 @@ case "$1" in
     ;;
   restart|force-reload)
     echo -n "Restarting music player daemon: mpd"
-    start-stop-daemon --start --quiet --exec /usr/bin/mpd
-    sleep 2
     start-stop-daemon --stop --quiet --exec /usr/bin/mpd
+    sleep 2
+    start-stop-daemon --start --quiet --exec /usr/bin/mpd
     echo "."
     ;;
   *)
diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb
index 4f84dc83bd..f4ba6e570e 100644
--- a/recipes/musicpd/mpd_0.14.2.bb
+++ b/recipes/musicpd/mpd_0.14.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 	   file://mpd/mpd.conf \
            file://mpd/mpd.init"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"
diff --git a/recipes/musicpd/mpd_0.15.bb b/recipes/musicpd/mpd_0.15.bb
index a10be212cc..0f6295da93 100644
--- a/recipes/musicpd/mpd_0.15.bb
+++ b/recipes/musicpd/mpd_0.15.bb
@@ -12,6 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"
 
+PR = "r1"
+
 # Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
 # be built, instead we use the OE built versions which should be installed
 # in staging - remove the --with and replace with --enable to use the local
diff --git a/recipes/openmoko-3rdparty/iliwi_git.bb b/recipes/openmoko-3rdparty/iliwi_git.bb
new file mode 100644
index 0000000000..0abd5c9b0f
--- /dev/null
+++ b/recipes/openmoko-3rdparty/iliwi_git.bb
@@ -0,0 +1,20 @@
+DESCRIPTION = "Iliwi connects you."
+HOMEPAGE = "http://github.com/Ebbe/Iliwi"
+LICENSE = "GPLv3"
+AUTHOR = "Esben Damgaard <ebbe@hvemder.dk>"
+DEPENDS = "dbus-glib elementary"
+# killall and udhcpc from busybox are enough
+RDEPENDS = "wireless-tools wpa-supplicant"
+
+SRCREV = "adae747061e8d885bbe9084814dad169fb00fae2"
+PV = "0.0.1+gitr${SRCPV}"
+
+SRC_URI = "git://github.com/Ebbe/Iliwi.git;protocol=http;branch=master"
+S = "${WORKDIR}/git"
+
+inherit autotools vala
+
+# needed because there is do_stage_append in vala.bbclass and do_stage() was removed..
+do_stage() {
+
+}
diff --git a/recipes/tasks/task-cli-tools.bb b/recipes/tasks/task-cli-tools.bb
index c6f5addfbd..4f367faeee 100644
--- a/recipes/tasks/task-cli-tools.bb
+++ b/recipes/tasks/task-cli-tools.bb
@@ -1,8 +1,9 @@
-DESCRIPTION = "A set of command line tools useful for debugging"
+DESCRIPTION = "A set of useful command line tools"
+DESCRIPTION_${PN}-debug = "A set of command line tools useful for debugging"
 SECTION = "console"
 LICENSE = "MIT"
 PV = "1.0"
-PR = "r14"
+PR = "r15"
 
 inherit task
 
@@ -21,10 +22,8 @@ RDEPENDS_${PN} = "\
   nfs-utils-client \
   powertop \
   screen \
-  serial-forward \
   socat \
   sysstat \
-  tcpdump \
 "
 
 RDEPENDS_${PN}-debug = "\
@@ -38,5 +37,7 @@ RDEPENDS_${PN}-debug = "\
   pxaregs \
   s3c24xx-gpio \
   s3c64xx-gpio \
+  serial-forward \
   strace \
+  tcpdump \
 "
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index a0d0a154fa..1fa929efcf 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r51"
+PR = "r52"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -274,10 +274,12 @@ RDEPENDS_${PN} += "\
 		qi \
 		qi-ubi \
 		wpa-gui \
+		iliwi \
 		gabriel \
 		stopwatch \
 		qgpslog \
 		litephone \
+		linphone \
 		rtmom \
 		ventura \
 		emtooth \
diff --git a/recipes/udev/udev-static-124/flags.patch b/recipes/udev/udev-static-124/flags.patch
new file mode 100644
index 0000000000..13f20eb6a8
--- /dev/null
+++ b/recipes/udev/udev-static-124/flags.patch
@@ -0,0 +1,56 @@
+---
+ Makefile |   16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+Index: udev-115/Makefile
+===================================================================
+--- udev-115.orig/Makefile	2007-08-24 01:29:54.000000000 +0200
++++ udev-115/Makefile	2007-09-20 17:21:45.000000000 +0200
+@@ -112,39 +112,39 @@
+ AR = $(CROSS_COMPILE)ar
+ RANLIB = $(CROSS_COMPILE)ranlib
+ 
+-CFLAGS		+= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
++override CFLAGS	= -g -Wall -pipe -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64
+ WARNINGS	= -Wstrict-prototypes -Wsign-compare -Wshadow \
+ 		  -Wchar-subscripts -Wmissing-declarations -Wnested-externs \
+ 		  -Wpointer-arith -Wcast-align -Wsign-compare -Wmissing-prototypes
+-CFLAGS		+= $(WARNINGS)
++override CFLAGS	+= $(WARNINGS)
+ 
+ LDFLAGS += -Wl,-warn-common,--as-needed
+ 
+ OPTFLAGS = -Os
+-CFLAGS += $(OPTFLAGS)
++override CFLAGS += $(OPTFLAGS)
+ 
+ ifeq ($(strip $(USE_LOG)),true)
+-	CFLAGS += -DUSE_LOG
++	override CFLAGS += -DUSE_LOG
+ endif
+ 
+ # if DEBUG is enabled, then we do not strip
+ ifeq ($(strip $(DEBUG)),true)
+-	CFLAGS  += -DDEBUG
++	override CFLAGS  += -DDEBUG
+ endif
+ 
+ ifeq ($(strip $(USE_GCOV)),true)
+-	CFLAGS += -fprofile-arcs -ftest-coverage
++	override CFLAGS += -fprofile-arcs -ftest-coverage
+ 	LDFLAGS += -fprofile-arcs
+ endif
+ 
+ ifeq ($(strip $(USE_SELINUX)),true)
+ 	UDEV_OBJS += udev_selinux.o
+ 	LIB_OBJS += -lselinux -lsepol
+-	CFLAGS += -DUSE_SELINUX
++	override CFLAGS += -DUSE_SELINUX
+ endif
+ 
+ ifeq ($(strip $(USE_STATIC)),true)
+-	CFLAGS += -DUSE_STATIC
++	override CFLAGS += -DUSE_STATIC
+ 	LDFLAGS += -static
+ endif
+ 
diff --git a/recipes/udev/udev-static-124/libvolume-id-soname.patch b/recipes/udev/udev-static-124/libvolume-id-soname.patch
new file mode 100644
index 0000000000..56365a4351
--- /dev/null
+++ b/recipes/udev/udev-static-124/libvolume-id-soname.patch
@@ -0,0 +1,12 @@
+diff -uNr udev-124-orig/extras/volume_id/lib/Makefile udev-124/extras/volume_id/lib/Makefile
+--- udev-124-orig/extras/volume_id/lib/Makefile	2008-06-12 01:24:30.000000000 -0400
++++ udev-124/extras/volume_id/lib/Makefile	2009-01-14 23:32:42.000000000 -0500
+@@ -113,7 +113,7 @@
+ ifeq ($(libdir),$(usrlibdir))
+ 	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+ else
+-	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
++	ln -sf ../..$(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so
+ endif
+ 	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig
+ 	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc
diff --git a/recipes/udev/udev-static-124/mtd-exclude-persistent.patch b/recipes/udev/udev-static-124/mtd-exclude-persistent.patch
new file mode 100644
index 0000000000..204b7b487d
--- /dev/null
+++ b/recipes/udev/udev-static-124/mtd-exclude-persistent.patch
@@ -0,0 +1,13 @@
+Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
+
+--- a/etc/udev/rules.d/60-persistent-storage.rules	2008-06-12 07:24:30.000000000 +0200
++++ b/etc/udev/rules.d/60-persistent-storage.rules	2009-08-18 11:39:23.595063264 +0200
+@@ -10,7 +10,7 @@
+ SUBSYSTEM!="block", GOTO="persistent_storage_end"
+ 
+ # skip rules for inappropriate block devices
+-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
++KERNEL=="ram*|loop*|fd*|mtd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
+ 
+ # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
diff --git a/recipes/udev/udev-static-124/noasmlinkage.patch b/recipes/udev/udev-static-124/noasmlinkage.patch
new file mode 100644
index 0000000000..d58a7ea4de
--- /dev/null
+++ b/recipes/udev/udev-static-124/noasmlinkage.patch
@@ -0,0 +1,45 @@
+diff -pru udev-124.orig/test-udev.c udev-124/test-udev.c
+--- udev-124.orig/test-udev.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/test-udev.c	2008-07-07 14:43:37.000000000 +0100
+@@ -46,7 +46,7 @@ void log_message(int priority, const cha
+ }
+ #endif
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGALRM:
+diff -pru udev-124.orig/udevd.c udev-124/udevd.c
+--- udev-124.orig/udevd.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevd.c	2008-07-07 14:43:58.000000000 +0100
+@@ -87,7 +87,7 @@ void log_message(int priority, const cha
+ 
+ #endif
+ 
+-static void asmlinkage udev_event_sig_handler(int signum)
++static void udev_event_sig_handler(int signum)
+ {
+ 	if (signum == SIGALRM)
+ 		exit(1);
+@@ -798,7 +798,7 @@ static struct udevd_uevent_msg *get_netl
+ 	return msg;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	switch (signum) {
+ 		case SIGINT:
+diff -pru udev-124.orig/udevmonitor.c udev-124/udevmonitor.c
+--- udev-124.orig/udevmonitor.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevmonitor.c	2008-07-07 14:44:24.000000000 +0100
+@@ -97,7 +97,7 @@ static int init_uevent_netlink_sock(void
+ 	return 0;
+ }
+ 
+-static void asmlinkage sig_handler(int signum)
++static void sig_handler(int signum)
+ {
+ 	if (signum == SIGINT || signum == SIGTERM)
+ 		udev_exit = 1;
diff --git a/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch b/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch
new file mode 100644
index 0000000000..5182542461
--- /dev/null
+++ b/recipes/udev/udev-static-124/udevtrigger_add_devname_filtering.patch
@@ -0,0 +1,99 @@
+diff -pru udev-124.orig/udevtrigger.c udev-124/udevtrigger.c
+--- udev-124.orig/udevtrigger.c	2008-06-12 06:24:30.000000000 +0100
++++ udev-124/udevtrigger.c	2008-07-07 15:10:09.000000000 +0100
+@@ -42,6 +42,8 @@ static int dry_run;
+ LIST_HEAD(device_list);
+ LIST_HEAD(filter_subsystem_match_list);
+ LIST_HEAD(filter_subsystem_nomatch_list);
++LIST_HEAD(filter_kernel_match_list);
++LIST_HEAD(filter_kernel_nomatch_list);
+ LIST_HEAD(filter_attr_match_list);
+ LIST_HEAD(filter_attr_nomatch_list);
+ static int sock = -1;
+@@ -331,6 +333,26 @@ static int attr_match(const char *path, 
+ 	return 0;
+ }
+ 
++static int kernel_filtered(const char *kernel)
++{
++	struct name_entry *loop_name;
++
++	/* skip devices matching the prohibited kernel device names */
++	list_for_each_entry(loop_name, &filter_kernel_nomatch_list, node)
++		if (fnmatch(loop_name->name, kernel, 0) == 0)
++			return 1;
++
++	/* skip devices not matching the listed kernel device names */
++	if (!list_empty(&filter_kernel_match_list)) {
++		list_for_each_entry(loop_name, &filter_kernel_match_list, node)
++			if (fnmatch(loop_name->name, kernel, 0) == 0)
++				return 0;
++		return 1;
++	}
++
++	return 0;
++}
++
+ static int attr_filtered(const char *path)
+ {
+ 	struct name_entry *loop_name;
+@@ -409,6 +431,9 @@ static void scan_subsystem(const char *s
+ 					if (dent2->d_name[0] == '.')
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -465,6 +490,9 @@ static void scan_block(void)
+ 					if (!strcmp(dent2->d_name,"device"))
+ 						continue;
+ 
++					if (kernel_filtered(dent2->d_name))
++						continue;
++
+ 					strlcpy(dirname2, dirname, sizeof(dirname2));
+ 					strlcat(dirname2, "/", sizeof(dirname2));
+ 					strlcat(dirname2, dent2->d_name, sizeof(dirname2));
+@@ -576,6 +604,8 @@ int udevtrigger(int argc, char *argv[], 
+ 		{ "subsystem-nomatch", 1, NULL, 'S' },
+ 		{ "attr-match", 1, NULL, 'a' },
+ 		{ "attr-nomatch", 1, NULL, 'A' },
++		{ "kernel-match", 1, NULL, 'k' },
++		{ "kernel-nomatch", 1, NULL, 'K' },
+ 		{ "env", 1, NULL, 'e' },
+ 		{}
+ 	};
+@@ -622,6 +652,12 @@ int udevtrigger(int argc, char *argv[], 
+ 		case 'A':
+ 			name_list_add(&filter_attr_nomatch_list, optarg, 0);
+ 			break;
++		case 'k':
++			name_list_add(&filter_kernel_match_list, optarg, 0);
++			break;
++		case 'K':
++			name_list_add(&filter_kernel_nomatch_list, optarg, 0);
++			break;
+ 		case 'h':
+ 			printf("Usage: udevadm trigger OPTIONS\n"
+ 			       "  --verbose                       print the list of devices while running\n"
+@@ -632,6 +668,8 @@ int udevtrigger(int argc, char *argv[], 
+ 			       "  --env=<KEY>=<value>             pass an additional key (works only with --socket=)\n"
+ 			       "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
+ 			       "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
++			       "  --kernel-match=<subsystem>	  trigger devices from a matching kernel device name\n"
++			       "  --kernel-nomatch=<subsystem>	  exclude devices from a matching kernel device name\n"
+ 			       "  --attr-match=<file[=<value>]>   trigger devices with a matching sysfs\n"
+ 			       "                                  attribute\n"
+ 			       "  --attr-nomatch=<file[=<value>]> exclude devices with a matching sysfs\n"
+@@ -701,6 +739,8 @@ int udevtrigger(int argc, char *argv[], 
+ exit:
+ 	name_list_cleanup(&filter_subsystem_match_list);
+ 	name_list_cleanup(&filter_subsystem_nomatch_list);
++	name_list_cleanup(&filter_kernel_match_list);
++	name_list_cleanup(&filter_kernel_nomatch_list);
+ 	name_list_cleanup(&filter_attr_match_list);
+ 	name_list_cleanup(&filter_attr_nomatch_list);
+ 
diff --git a/recipes/udev/udev-static-124/vol_id_ld.patch b/recipes/udev/udev-static-124/vol_id_ld.patch
new file mode 100644
index 0000000000..11126eef8d
--- /dev/null
+++ b/recipes/udev/udev-static-124/vol_id_ld.patch
@@ -0,0 +1,17 @@
+---
+ extras/volume_id/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: udev-115/extras/volume_id/Makefile
+===================================================================
+--- udev-115.orig/extras/volume_id/Makefile	2007-09-20 18:17:59.000000000 +0200
++++ udev-115/extras/volume_id/Makefile	2007-09-20 18:18:08.000000000 +0200
+@@ -44,7 +44,7 @@
+ ifeq ($(strip $(VOLUME_ID_STATIC)),true)
+ 	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) lib/libvolume_id.a $(LIB_OBJS)
+ else
+-	$(Q) $(LD) $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -Llib -lvolume_id $(LIB_OBJS)
++	$(Q) $(LD) -Llib $(LDFLAGS) -o $@ $@.o $(LIBUDEV) -lvolume_id $(LIB_OBJS)
+ endif
+ 
+ # man pages
diff --git a/recipes/udev/udev-static_124.bb b/recipes/udev/udev-static_124.bb
new file mode 100644
index 0000000000..1ea088a6b5
--- /dev/null
+++ b/recipes/udev/udev-static_124.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "Static version of udev for devices with an old (e.g. <2.6.27) kernel"
+
+SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
+	   file://noasmlinkage.patch;patch=1 \
+	   file://flags.patch;patch=1 \
+	   file://vol_id_ld.patch;patch=1 \
+	   file://udevtrigger_add_devname_filtering.patch;patch=1 \
+	   file://libvolume-id-soname.patch;patch=1 \
+	   file://mtd-exclude-persistent.patch;patch=1 \
+	   "
+
+require udev.inc
+
+S = "${WORKDIR}/udev-${PV}"
+
+export USE_STATIC = "true"
+
+CFLAGS += "-DUSE_STATIC"
+LDFLAGS += "-static"
+
+# Overriding PACKAGES is bad, but we only want ${PN}
+PACKAGES = "${PN}"
+FILES_${PN} = "${base_sbindir}/*-${PV}-static"
+
+
+UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/"
+EXTRA_OEMAKE += "libudevdir=/lib/udev libdir=${base_libdir} prefix="
+
+do_install () {
+	install -d ${D}${usrsbindir} \
+		   ${D}${sbindir}
+	oe_runmake 'DESTDIR=${D}' INSTALL=install install
+
+	mv ${D}${base_sbindir}/udevd ${D}${base_sbindir}/udevd-${PV}-static
+	mv ${D}${base_sbindir}/udevadm ${D}${base_sbindir}/udevadm-${PV}-static
+}
+
+SRC_URI[md5sum] = "2ea9229208154229c5d6df6222f74ad7"
+SRC_URI[sha256sum] = "cc9f58ff58fbd3f5868e1f1e368e3c93e1f441afd0ac1dcbd5d01a9ce5b5b0d7"
diff --git a/recipes/xchat/files/46_CVE-2009-0315.dpatch b/recipes/xchat/files/46_CVE-2009-0315.dpatch
new file mode 100755
index 0000000000..97bd442279
--- /dev/null
+++ b/recipes/xchat/files/46_CVE-2009-0315.dpatch
@@ -0,0 +1,26 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 46_CVE-2009-0315.dpatch by Nico Golde <nion@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad xchat-2.8.6~/plugins/python/python.c xchat-2.8.6/plugins/python/python.c
+--- xchat-2.8.6~/plugins/python/python.c	2008-03-29 06:57:35.000000000 +0100
++++ xchat-2.8.6/plugins/python/python.c	2009-02-05 19:13:02.000000000 +0100
+@@ -1106,6 +1106,7 @@
+ 	}
+ 
+ 	PySys_SetArgv(1, argv);
++	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
+ 	PySys_SetObject("__plugin__", (PyObject *) plugin);
+ 
+ 	/* Set stdout and stderr to xchatout. */
+@@ -2110,6 +2111,7 @@
+ 	Py_SetProgramName("xchat");
+ 	Py_Initialize();
+ 	PySys_SetArgv(1, argv);
++	PyRun_SimpleString("import sys; sys.path = filter(None, sys.path)");
+ 
+ 	Plugin_Type.ob_type = &PyType_Type;
+ 	Context_Type.ob_type = &PyType_Type;
diff --git a/recipes/xchat/files/53_fix_deprecated_widgets.dpatch b/recipes/xchat/files/53_fix_deprecated_widgets.dpatch
new file mode 100755
index 0000000000..bab087b28e
--- /dev/null
+++ b/recipes/xchat/files/53_fix_deprecated_widgets.dpatch
@@ -0,0 +1,53 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 53_fix_deprecated_widgets.dpatch by Davide Puricelli <evo@debian.org>
+##
+## Description: Fix FTBFS errors due to new GTK 2.20 widgets names.
+
+@DPATCH@
+diff -Naur xchat-2.8.6foo/src/fe-gtk/fe-gtk.c xchat-2.8.6/src/fe-gtk/fe-gtk.c
+--- xchat-2.8.6foo/src/fe-gtk/fe-gtk.c	2010-04-06 21:48:19.000000000 +0200
++++ xchat-2.8.6/src/fe-gtk/fe-gtk.c	2010-04-06 21:49:27.000000000 +0200
+@@ -819,7 +819,7 @@
+ 	switch (info_type)
+ 	{
+ 	case 0:	/* window status */
+-		if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (sess->gui->window)))
++		if (!gtk_widget_get_visible (GTK_WINDOW (sess->gui->window)))
+ 			return 2;	/* hidden (iconified or systray) */
+ #if GTK_CHECK_VERSION(2,4,0)
+ 		if (gtk_window_is_active (GTK_WINDOW (sess->gui->window)))
+diff -Naur xchat-2.8.6foo/src/fe-gtk/maingui.c xchat-2.8.6/src/fe-gtk/maingui.c
+--- xchat-2.8.6foo/src/fe-gtk/maingui.c	2008-04-01 10:53:41.000000000 +0200
++++ xchat-2.8.6/src/fe-gtk/maingui.c	2010-04-06 21:50:45.000000000 +0200
+@@ -599,7 +599,7 @@
+ 	int num;
+ 	GtkWidget *f = NULL;
+ 
+-	if (current_sess && GTK_WIDGET_HAS_FOCUS (current_sess->gui->input_box))
++	if (current_sess && gtk_widget_has_focus (current_sess->gui->input_box))
+ 		f = current_sess->gui->input_box;
+ 
+ 	num = gtk_notebook_page_num (GTK_NOTEBOOK (mg_gui->note_book), box);
+@@ -809,8 +809,8 @@
+ static void
+ mg_hide_empty_pane (GtkPaned *pane)
+ {
+-	if ((pane->child1 == NULL || !GTK_WIDGET_VISIBLE (pane->child1)) &&
+-		 (pane->child2 == NULL || !GTK_WIDGET_VISIBLE (pane->child2)))
++	if ((pane->child1 == NULL || !gtk_widget_get_visible (pane->child1)) &&
++		 (pane->child2 == NULL || !gtk_widget_get_visible (pane->child2)))
+ 	{
+ 		gtk_widget_hide (GTK_WIDGET (pane));
+ 		return;
+diff -Naur xchat-2.8.6foo/src/fe-gtk/menu.c xchat-2.8.6/src/fe-gtk/menu.c
+--- xchat-2.8.6foo/src/fe-gtk/menu.c	2008-06-08 09:59:37.000000000 +0200
++++ xchat-2.8.6/src/fe-gtk/menu.c	2010-04-06 21:49:54.000000000 +0200
+@@ -1670,7 +1670,7 @@
+ menu_canacaccel (GtkWidget *widget, guint signal_id, gpointer user_data)
+ {
+ 	/* GTK2.2 behaviour */
+-	return GTK_WIDGET_IS_SENSITIVE (widget);
++	return gtk_widget_is_sensitive (widget);
+ }
+ 
+ #endif
diff --git a/recipes/xchat/xchat_2.8.6.bb b/recipes/xchat/xchat_2.8.6.bb
index d6d6200d83..9e203fb682 100644
--- a/recipes/xchat/xchat_2.8.6.bb
+++ b/recipes/xchat/xchat_2.8.6.bb
@@ -4,9 +4,12 @@ HOMEPAGE = "http://www.xchat.org"
 SECTION = "x11/network"
 DEPENDS = "libgcrypt zlib gtk+"
 DEPENDS += "gdk-pixbuf-csource-native"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2"
+SRC_URI = "http://www.xchat.org/files/source/2.8/xchat-${PV}.tar.bz2 \
+	 file://46_CVE-2009-0315.dpatch;patch=1 \
+	 file://53_fix_deprecated_widgets.dpatch;patch=1 \
+	 "
 
 inherit autotools
 
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx/0001-s3c64xx-update-for-resources-RAC-API-removal.patch b/recipes/xorg-driver/xf86-video-s3c64xx/0001-s3c64xx-update-for-resources-RAC-API-removal.patch
new file mode 100644
index 0000000000..638de08f6b
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-s3c64xx/0001-s3c64xx-update-for-resources-RAC-API-removal.patch
@@ -0,0 +1,54 @@
+From d09a6fb491439814f5b746d0e749e956f6563a80 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sat, 17 Apr 2010 10:46:10 +0200
+Subject: [PATCH 1/3] s3c64xx: update for resources/RAC API removal
+
+---
+ src/s3c64xx_driver.c |    4 ++++
+ src/s3c64xx_xaa.c    |    2 ++
+ 2 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/src/s3c64xx_driver.c b/src/s3c64xx_driver.c
+index 4455b14..f31776b 100644
+--- a/src/s3c64xx_driver.c
++++ b/src/s3c64xx_driver.c
+@@ -59,8 +59,10 @@
+ #include "xf86cmap.h"
+ #include "dgaproc.h"
+ 
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
+ #include "xf86RAC.h"
++#endif
+ 
+ /* RandR rotate */
+ #include "X11/extensions/randr.h"
+@@ -420,9 +422,11 @@ S3CDevPreInit(ScrnInfoPtr pScrn, int flags)
+ 
+    pS3CDEV->pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
+ 
++#ifndef XSERVER_LIBPCIACCESS
+    pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
+    /* XXX Is this right?  Can probably remove RAC_FB */
+    pScrn->racIoFlags = RAC_FB | RAC_COLORMAP | RAC_CURSOR | RAC_VIEWPORT;
++#endif
+ 
+    /* open device */
+    if (!fbdevHWInit(pScrn,NULL,xf86FindOptionValue(pS3CDEV->pEnt->device->options,"s3c64xx")))
+diff --git a/src/s3c64xx_xaa.c b/src/s3c64xx_xaa.c
+index 16cb476..e62c37c 100644
+--- a/src/s3c64xx_xaa.c
++++ b/src/s3c64xx_xaa.c
+@@ -57,7 +57,9 @@
+ #include "xaa.h"
+ #include "xaarop.h"
+ 
++#ifndef XSERVER_LIBPCIACCESS
+ #include "xf86Resources.h"
++#endif
+ 
+ /*
+ ** suspend/resume fails unless you have a correctly restoring register state
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx/0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch b/recipes/xorg-driver/xf86-video-s3c64xx/0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch
new file mode 100644
index 0000000000..bcd24e8579
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-s3c64xx/0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch
@@ -0,0 +1,45 @@
+From 1311ff65283ed306bcac4b4b971e02144d65da6b Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sat, 17 Apr 2010 10:50:38 +0200
+Subject: [PATCH 2/3] DPMS header was split into dpms.h (client) and dpmsconst.h (server). Drivers need to include dpmsconst.h if xextproto 7.1 is available.
+
+---
+ configure.ac      |    4 ++++
+ src/s3c64xx_lcd.c |    4 ++++
+ 2 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c69218f..a9ec2f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,6 +58,10 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
+ # Checks for pkg-config packages
+ PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES])
+ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
++PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
++                  HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
++                  HAVE_XEXTPROTO_71="no")
++AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
+ 
+ AM_CONDITIONAL(PCIACCESS, [test "x$PCIACCESS" = xyes])
+ if test "x$PCIACCESS" = xyes; then
+diff --git a/src/s3c64xx_lcd.c b/src/s3c64xx_lcd.c
+index 5200f60..02627ae 100644
+--- a/src/s3c64xx_lcd.c
++++ b/src/s3c64xx_lcd.c
+@@ -53,8 +53,12 @@
+ 
+ #include "s3c64xx.h" 
+ 
++#ifdef HAVE_XEXTPROTO_71
++#include <X11/extensions/dpmsconst.h>
++#else
+ #define DPMS_SERVER
+ #include "X11/extensions/dpms.h"
++#endif
+ 
+ enum OutputTypes  {
+    S3C_OUTPUT_LCD,
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx/0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch b/recipes/xorg-driver/xf86-video-s3c64xx/0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch
new file mode 100644
index 0000000000..f8bb33dc73
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-s3c64xx/0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch
@@ -0,0 +1,25 @@
+From d004fb3e90acffdf800f3d07642fac364dd20f2d Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Sat, 17 Apr 2010 10:55:47 +0200
+Subject: [PATCH 3/3] s3c64xx lcd: include "cursorstr.h to get CursorRec and AllocCursorARGB definitions
+
+---
+ src/s3c64xx_lcd.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/src/s3c64xx_lcd.c b/src/s3c64xx_lcd.c
+index 02627ae..3005d2e 100644
+--- a/src/s3c64xx_lcd.c
++++ b/src/s3c64xx_lcd.c
+@@ -60,6 +60,8 @@
+ #include "X11/extensions/dpms.h"
+ #endif
+ 
++#include "cursorstr.h"
++
+ enum OutputTypes  {
+    S3C_OUTPUT_LCD,
+    S3C_OUTPUT_TV,  /* add another Output if TV out is desired */
+-- 
+1.6.6.1
+
diff --git a/recipes/xorg-driver/xf86-video-s3c64xx_git.bb b/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
new file mode 100644
index 0000000000..934c2195b4
--- /dev/null
+++ b/recipes/xorg-driver/xf86-video-s3c64xx_git.bb
@@ -0,0 +1,20 @@
+require xorg-driver-video.inc
+
+PR_append = "a"
+
+DESCRIPTION = "X.Org X server -- driver for the Samsung s3c64xx SoC family"
+
+SRCREV = "79c2402ba26e57f4c9fd27f75f8a0324c72c13be"
+PV = "0.0.2+${PR}+gitr${SRCREV}"
+
+SRC_URI = "git://git.gitorious.org/xf86-video-s3c64xx/xf86-video-s3c64xx.git;protocol=http \
+           file://0001-s3c64xx-update-for-resources-RAC-API-removal.patch;patch=1 \
+           file://0002-DPMS-header-was-split-into-dpms.h-client-and-dpmscon.patch;patch=1 \
+           file://0003-s3c64xx-lcd-include-cursorstr.h-to-get-CursorRec-and.patch;patch=1 \
+          "
+
+S = "${WORKDIR}/git"
+
+CFLAGS += " -I${STAGING_INCDIR}/xorg "
+
+
diff --git a/recipes/xorg-lib/pixman_git.bb b/recipes/xorg-lib/pixman_git.bb
index 3ae70760df..983a0ac74c 100644
--- a/recipes/xorg-lib/pixman_git.bb
+++ b/recipes/xorg-lib/pixman_git.bb
@@ -1,6 +1,6 @@
 require pixman.inc
 PV = "0.17.13"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 PR_append = "+gitr${SRCPV}"
 
 SRCREV = "69f1ec9a7827aeb522fcae99846237ef0f896e7b"
diff --git a/recipes/xorg-xserver/xserver-xorg_git.bb b/recipes/xorg-xserver/xserver-xorg_git.bb
index d45156d6be..20c8b09c58 100644
--- a/recipes/xorg-xserver/xserver-xorg_git.bb
+++ b/recipes/xorg-xserver/xserver-xorg_git.bb
@@ -3,7 +3,7 @@ require xorg-xserver-common.inc
 DESCRIPTION = "the X.Org X server"
 DEPENDS += "pixman libpciaccess openssl dri2proto glproto xorg-minimal-fonts font-util-native"
 PV = "1.7.999"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 PR_append = "+gitr${SRCPV}"
 PE = "2"