From 4e9de808a7cc1f90f33864bdfe06fa9b917ea654 Mon Sep 17 00:00:00 2001
From: Yuri Bushmelev <jay4mail@gmail.com>
Date: Tue, 15 Dec 2009 23:11:46 +0300
Subject: Patch added to fix QEMU 0.10.3 compilation on distros with
 FORTIFY_SOURCE enabled.

---
 .../qemu/qemu-0.10.3/fix_fortify_source_compilation.patch   | 13 +++++++++++++
 recipes/qemu/qemu_0.10.3.bb                                 |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch

diff --git a/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch b/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch
new file mode 100644
index 0000000000..326d197167
--- /dev/null
+++ b/recipes/qemu/qemu-0.10.3/fix_fortify_source_compilation.patch
@@ -0,0 +1,13 @@
+--- qemu-0.10.3/block-vvfat.c.orig	2009-05-01 21:02:44 +0400
++++ qemu-0.10.3/block-vvfat.c	2009-12-15 22:06:04 +0300
+@@ -865,7 +865,9 @@
+     {
+ 	direntry_t* entry=array_get_next(&(s->directory));
+ 	entry->attributes=0x28; /* archive | volume label */
+-	snprintf((char*)entry->name,11,"QEMU VVFAT");
++	/* snprintf((char*)entry->name,11,"QEMU VVFAT"); */
++	snprintf(entry->name, sizeof(entry->name), "QEMU VV");
++	snprintf(entry->extension, sizeof(entry->extension), "FAT");
+     }
+ 
+     /* Now build FAT, and write back information into directory */
diff --git a/recipes/qemu/qemu_0.10.3.bb b/recipes/qemu/qemu_0.10.3.bb
index f65f60decd..182f4b4407 100644
--- a/recipes/qemu/qemu_0.10.3.bb
+++ b/recipes/qemu/qemu_0.10.3.bb
@@ -22,6 +22,7 @@ SRC_URI = "\
     file://fix_segfault.patch;patch=1 \
     file://no-strip.patch;patch=1 \
     file://fix_baum_c_compilation.patch;patch=1 \
+    file://fix_fortify_source_compilation.patch;patch=1 \
     "
 
 S = "${WORKDIR}/qemu-${PV}"
-- 
cgit 1.2.3-korg


From b0c1ffe3b60092d9664e06aeb328365d8779361b Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Wed, 16 Dec 2009 12:45:17 +0100
Subject: checksums.conf: add checksums for packages added to xorg-7.5 branch

---
 conf/checksums.ini | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 8fc614beb3..1f76481579 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -15566,6 +15566,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
 md5=b73cbd5bc3cd268722a624a5f1318fde
 sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258
 
+[http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.1.0.tar.bz2]
+md5=273329a78c2e9ea189ac416c7fde94a1
+sha256=c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/liblbxutil-X11R7.0-1.0.0.tar.bz2]
 md5=1bcffde85723f78243d1ba60e1ebaef6
 sha256=e485f36d74f477f3d235a05bb67b502dc744092569842d9ab45e2f785f74f556
@@ -16122,6 +16126,10 @@ sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
 md5=685cb20e7a6165bc010972f1183addbd
 sha256=5ccb9683b8be76edfceab4bf006e1cce9018e0d3dea5e54aa72e82798213fead
 
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.11.0.tar.bz2]
+md5=686320dcec98daad0bdfb8894d4f2a2b
+sha256=6e38be12b656c83c66a6fd8ba56c041d8188218278219c88ee635242ec1c7dab
+
 [http://www.xmailserver.org/libpcl-1.4.tar.gz]
 md5=6d63c462911349de80109c0161ed6d37
 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -17518,6 +17526,10 @@ sha256=986a923a5247468db1d2a03e93268f4025ae5dc27e911dafc7b37e6a802122db
 md5=827a1ac5adf9aadd0c13b54a897e297b
 sha256=7156e58025e240a501d5b32244b923b283bb35014ea5a4081b70044af8aef7a3
 
+[http://xorg.freedesktop.org/releases/individual/app/listres-1.0.2.tar.bz2]
+md5=3c0d5d8d6abaf411cd0647bc7073ac38
+sha256=4d9e24b95619bc961936d241106ffcc483995de55629567113ad78ba0b37ffb7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/listres-X11R7.0-1.0.1.tar.bz2]
 md5=2eeb802272a7910bb8a52b308bf0d5f6
 sha256=41711ff3c94144b8a561146948b9b5fd49a55756532fa4d254d9a959e6622d87
@@ -26942,6 +26954,10 @@ sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401
 md5=51bb54c08415ee3c3000b7df9e9b07c5
 sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.4.1.tar.gz]
+md5=8ac38951e753f250aaefbd4ba0afda94
+sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -28474,6 +28490,10 @@ sha256=6d57420cce9201a14f2fb5c5f6bc8999ffdcc9520020d54290eb22db27c366c8
 md5=e56ce4424b89b2409c6e73e007a85da7
 sha256=462f2ae2fd389a87e09fa764a236cd04dcbf85bcfcd8000aa9a3810055511d8f
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.3.2.tar.bz2]
+md5=b2bfe368022eedf2671ee28daba31efc
+sha256=029bf469bd013bcc3e384c1297a05a59e4b9b3ba90a26c022b32c0819d115e28
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -28790,6 +28810,10 @@ sha256=e7d481c375a11df55eb8f12390c329c2bfda3258c689cec11cfec27cb5895c8b
 md5=2cf0a2b0b3006bcfcd85bb77d966244a
 sha256=ddd5ad4c25ad2f2e46134272bf047522882deba8ac3ac04d5e11f8bd9718620c
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2]
+md5=29a6f9da5123149e4abc8ff83880ed5c
+sha256=a63b48c5c8eb09416b941dea591a948e111d1b2e14d4620f25377cf47cf877e6
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-input-tek4957-1.1.0.tar.bz2]
 md5=be8a4bd474ad6c85b93f66dd6fcfa6ee
 sha256=09b9506d1bb1deaaf69872392bc56e1d75997bb8157e85a9121749bf5fe15727
@@ -29294,6 +29318,10 @@ sha256=f56d2bb42f6c4369dd3c6adc30988c53a229650f910b0db1bb3bf9376054011e
 md5=1b22188bd9012a148206940708b52ea6
 sha256=c18ce0410437ced9c171d2d6328a8406b79b6edacf55b9526594b446ee5a3641
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.16.tar.bz2]
+md5=fb02d5506e35054348d1c2b2c924530d
+sha256=4bf2f964b78d309769faa6a5d21c90a9907886623adf1f30ea890b4329bf578d
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-nv-2.1.3.tar.bz2]
 md5=f9b38e24157c3aac6014119ac18d76da
 sha256=8d9b5ea137c31919f7821e7f3ecbd133158813c1059f4a8ed0a723535d969952
@@ -30546,6 +30574,10 @@ sha256=400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4
 md5=4c5482552f38a7d42398a694cc9b2ee6
 sha256=de59f9be3d45fe93f445f39bec3cea09753a671e56863ce77e3a797d2df526b2
 
+[http://xorg.freedesktop.org/releases/individual/app/xlogo-1.0.2.tar.bz2]
+md5=7365c0852750134119734bc1879f60ca
+sha256=47a8aa4e8190772e24dd58266fdd4ba2723b5d7a23365a3e4c07c1263ffb3130
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xlogo-X11R7.0-1.0.1.tar.bz2]
 md5=0314b2f5173da64957031400638fa5f8
 sha256=1397377bae07e8907f73bc445e967d4d4400769e683c2119598d952c8ad28131
-- 
cgit 1.2.3-korg


From bedc7cb2e83bcfde2cf28ff5774d7f4829d8f0bd Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@buglabs.net>
Date: Wed, 16 Dec 2009 16:43:32 +0100
Subject: java.bbclass: stage all JAR files outside of ARCH related directories

When Java things are build for more then one architecture strange things
happen:

- first architecture builds fine
- next architectures fails to build

Thats due to lack of JAR files as they were built as PACKAGE_ARCH="all"
but staged as PACKAGE_ARCH="TARGET_ARCH" so BitBake do not build them
again but Java classes are unable to find them.

Solution is to stage JAR files to non-ARCH directory. I used
staging/java for it and build tested with stable/2009 and
org.openembedded.dev branches.

Signed-off-by: Marcin Juszkiewicz <marcin@buglabs.net>
---
 classes/java.bbclass | 2 +-
 conf/bitbake.conf    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/java.bbclass b/classes/java.bbclass
index b68035c13e..d4cf5aa954 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -13,7 +13,7 @@ libdir_jni ?= ${libdir}/jni
 # JVM bundle location on target
 libdir_jvm ?= ${libdir}/jvm
 
-STAGING_DATADIR_JAVA ?= ${STAGING_DATADIR}/java
+STAGING_DATADIR_JAVA ?= ${STAGING_DIR_JAVA}
 STAGING_LIBDIR_JNI ?= ${STAGING_LIBDIR}/jni
 STAGING_LIBDIR_JVM ?= ${STAGING_LIBDIR}/jvm
 
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 48e098db44..3a68959c6c 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -297,6 +297,7 @@ B = "${S}"
 
 STAGING_DIR = "${TMPDIR}/staging"
 
+STAGING_DIR_JAVA = "${STAGING_DIR}/java"
 STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
 STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
 STAGING_BINDIR_CROSS  = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
-- 
cgit 1.2.3-korg


From 05019cad32a0ebc0b44a0fbe48c27320417b760d Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@mvista.com>
Date: Thu, 21 May 2009 16:32:41 -0700
Subject: coreutils: don't patch the autotools files in the native recipes

If we patch autotools files in the native recipes and build them, the make
results in the make rules trying to rerun autoconf, automake, aclocal, etc,
and those don't yet exist when coreutils-native is built.  So we split out the
common target (not native) specific bits so that native recipes aren't
including the target recipes, so we can avoid applying those patches for
native.  This also avoids some duplication of target bits between the
versions.

Signed-off-by: Chris Larson <clarson@mvista.com>
---
 recipes/coreutils/coreutils-6.0.inc       |  7 +++
 recipes/coreutils/coreutils-7.1.inc       |  6 ++
 recipes/coreutils/coreutils-7.2.inc       |  4 ++
 recipes/coreutils/coreutils-native_6.0.bb |  7 +--
 recipes/coreutils/coreutils-native_7.1.bb |  7 +--
 recipes/coreutils/coreutils-native_7.2.bb |  7 +--
 recipes/coreutils/coreutils-target.inc    | 82 ++++++++++++++++++++++++++
 recipes/coreutils/coreutils_6.0.bb        | 86 +---------------------------
 recipes/coreutils/coreutils_7.1.bb        | 95 ++-----------------------------
 recipes/coreutils/coreutils_7.2.bb        | 92 ++----------------------------
 10 files changed, 121 insertions(+), 272 deletions(-)
 create mode 100644 recipes/coreutils/coreutils-6.0.inc
 create mode 100644 recipes/coreutils/coreutils-7.1.inc
 create mode 100644 recipes/coreutils/coreutils-7.2.inc
 create mode 100644 recipes/coreutils/coreutils-target.inc

diff --git a/recipes/coreutils/coreutils-6.0.inc b/recipes/coreutils/coreutils-6.0.inc
new file mode 100644
index 0000000000..0dd2512021
--- /dev/null
+++ b/recipes/coreutils/coreutils-6.0.inc
@@ -0,0 +1,7 @@
+require coreutils.inc
+
+SRC_URI = "\
+  ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
+  file://futimens.patch;patch=1 \
+  file://coreutils-install-use-STRIP.patch;patch=1 \
+"
diff --git a/recipes/coreutils/coreutils-7.1.inc b/recipes/coreutils/coreutils-7.1.inc
new file mode 100644
index 0000000000..7f77b9b1ca
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.1.inc
@@ -0,0 +1,6 @@
+require coreutils.inc
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz"
+
+# not thoroughly tested yet
+DEFAULT_PREFERENCE = "-1"
diff --git a/recipes/coreutils/coreutils-7.2.inc b/recipes/coreutils/coreutils-7.2.inc
new file mode 100644
index 0000000000..7ab42213c9
--- /dev/null
+++ b/recipes/coreutils/coreutils-7.2.inc
@@ -0,0 +1,4 @@
+require coreutils.inc
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
+           file://coreutils-7.2-fix-sort-segfault.patch;patch=1"
diff --git a/recipes/coreutils/coreutils-native_6.0.bb b/recipes/coreutils/coreutils-native_6.0.bb
index a3754df123..800aacc568 100644
--- a/recipes/coreutils/coreutils-native_6.0.bb
+++ b/recipes/coreutils/coreutils-native_6.0.bb
@@ -1,5 +1,4 @@
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
-require coreutils_${PV}.bb
+require coreutils-${PV}.inc
 require coreutils-native.inc
+
+PR = "r4"
diff --git a/recipes/coreutils/coreutils-native_7.1.bb b/recipes/coreutils/coreutils-native_7.1.bb
index a3754df123..6370c04ef7 100644
--- a/recipes/coreutils/coreutils-native_7.1.bb
+++ b/recipes/coreutils/coreutils-native_7.1.bb
@@ -1,5 +1,4 @@
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
-require coreutils_${PV}.bb
+require coreutils-${PV}.inc
 require coreutils-native.inc
+
+PR = "r1"
diff --git a/recipes/coreutils/coreutils-native_7.2.bb b/recipes/coreutils/coreutils-native_7.2.bb
index a3754df123..6370c04ef7 100644
--- a/recipes/coreutils/coreutils-native_7.2.bb
+++ b/recipes/coreutils/coreutils-native_7.2.bb
@@ -1,5 +1,4 @@
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/coreutils-${PV}"
-S = "${WORKDIR}/coreutils-${PV}"
-
-require coreutils_${PV}.bb
+require coreutils-${PV}.inc
 require coreutils-native.inc
+
+PR = "r1"
diff --git a/recipes/coreutils/coreutils-target.inc b/recipes/coreutils/coreutils-target.inc
new file mode 100644
index 0000000000..1dd1d369f3
--- /dev/null
+++ b/recipes/coreutils/coreutils-target.inc
@@ -0,0 +1,82 @@
+EXTRA_AUTORECONF += "-I ${S}/m4"
+SRC_URI += "file://onceonly.m4"
+
+# [ gets a special treatment and is not included in this
+bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \
+		env expand expr factor fmt fold groups head hostid id install \
+		join link logname md5sum mkfifo nice nl nohup od paste pathchk \
+		pinky pr printenv printf ptx readlink seq sha1sum shred sort \
+		split stat sum tac tail tee test tr tsort tty unexpand uniq \
+		unlink users vdir wc who whoami yes \
+		"
+
+# hostname gets a special treatment and is not included in this
+base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
+		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
+		     true uname \
+		     "
+
+sbindir_progs= "chroot"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4
+}
+
+do_install () {
+	autotools_do_install
+
+	# Renaming the utilities that should go in /usr/bin
+	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
+
+	# Renaming and moving the utilities that should go in /bin (FHS)
+	install -d ${D}${base_bindir}
+	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
+
+	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
+	install -d ${D}${sbindir}
+	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
+
+	# [ requires special handling because [.coreutils will cause the sed stuff
+	# in update-alternatives to fail, therefore use lbracket - the name used
+	# for the actual source file.
+	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
+	# hostname and uptime separated. busybox's versions are preferred
+	if [ -e ${D}${bindir}/hostname ]; then
+		mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
+	fi
+	if [ -e ${D}${bindir}/uptime ]; then
+		mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
+	fi
+}
+
+pkg_postinst_${PN} () {
+	# The utilities in /usr/bin
+	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
+
+	# The utilities in /bin
+	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
+
+	# The utilities in /usr/sbin
+	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
+
+	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
+	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
+	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
+	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
+}
+
+pkg_prerm_${PN} () {
+	# The utilities in /usr/bin
+	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The utilities in /bin
+	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The utilities in /usr/sbin
+	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
+
+	# The special cases
+	update-alternatives --remove hostname hostname.${PN}
+	update-alternatives --remove uptime uptime.${PN}
+	update-alternatives --remove '[' 'lbracket.${PN}'
+}
diff --git a/recipes/coreutils/coreutils_6.0.bb b/recipes/coreutils/coreutils_6.0.bb
index d0d082bc63..009dad34cf 100644
--- a/recipes/coreutils/coreutils_6.0.bb
+++ b/recipes/coreutils/coreutils_6.0.bb
@@ -1,89 +1,9 @@
-require coreutils.inc
+require coreutils-${PV}.inc
+require coreutils-target.inc
 
 PR = "r3"
 
-SRC_URI = "\
-  ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
+SRC_URI += "\
   file://man.patch;patch=1 \
   file://oe-old-tools.patch;patch=1 \
-  file://futimens.patch;patch=1 \
-  file://coreutils-install-use-STRIP.patch;patch=1 \
-  file://onceonly.m4 \
 "
-
-# [ gets a special treatment and is not included in this
-bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \
-		env expand expr factor fmt fold groups head hostid id install \
-		join link logname md5sum mkfifo nice nl nohup od paste pathchk \
-		pinky pr printenv printf ptx readlink seq sha1sum shred sort \
-		split stat sum tac tail tee test tr tsort tty unexpand uniq \
-		unlink users vdir wc who whoami yes \
-		"
-
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
-		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
-		     true uname \
-		     "
-
-sbindir_progs= "chroot"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4
-}
-
-do_install () {
-	autotools_do_install
-
-	# Renaming the utilities that should go in /usr/bin
-	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /bin (FHS)
-	install -d ${D}${base_bindir}
-	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
-	install -d ${D}${sbindir}
-	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
-
-	# [ requires special handling because [.coreutils will cause the sed stuff
-	# in update-alternatives to fail, therefore use lbracket - the name used
-	# for the actual source file.
-	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-	# hostname and uptime separated. busybox's versions are preferred
-	mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-	mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-
-}
-
-pkg_postinst_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
-
-pkg_prerm_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
-	update-alternatives --remove uptime uptime.${PN}
-	update-alternatives --remove '[' 'lbracket.${PN}'
-}
diff --git a/recipes/coreutils/coreutils_7.1.bb b/recipes/coreutils/coreutils_7.1.bb
index 6488e11a79..18ee4e36e1 100644
--- a/recipes/coreutils/coreutils_7.1.bb
+++ b/recipes/coreutils/coreutils_7.1.bb
@@ -1,92 +1,7 @@
-require coreutils.inc
-PR = "r0"
+require coreutils-${PV}.inc
+require coreutils-target.inc
 
-# not thoroughly testes yet
-DEFAULT_PREFERENCE = "-1"
+PR = "r0.1"
 
-SRC_URI = "\
-  ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
-  file://automake-version.patch;patch=1 \
-  file://man.patch;patch=1 \
-  file://onceonly.m4 \
-"
-
-# [ gets a special treatment and is not included in this
-bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \
-		env expand expr factor fmt fold groups head hostid id install \
-		join link logname md5sum mkfifo nice nl nohup od paste pathchk \
-		pinky pr printenv printf ptx readlink seq sha1sum shred sort \
-		split stat sum tac tail tee test tr tsort tty unexpand uniq \
-		unlink users vdir wc who whoami yes \
-		"
-
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
-		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
-		     true uname \
-		     "
-
-sbindir_progs= "chroot"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4
-}
-
-do_install () {
-	autotools_do_install
-
-	# Renaming the utilities that should go in /usr/bin
-	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /bin (FHS)
-	install -d ${D}${base_bindir}
-	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
-	install -d ${D}${sbindir}
-	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
-
-	# [ requires special handling because [.coreutils will cause the sed stuff
-	# in update-alternatives to fail, therefore use lbracket - the name used
-	# for the actual source file.
-	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-	# hostname and uptime separated. busybox's versions are preferred
-	if [ -e ${D}${bindir}/hostname ]; then
-		mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-	fi
-	if [ -e ${D}${bindir}/uptime ]; then
-		mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-	fi
-}
-
-pkg_postinst_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
-
-pkg_prerm_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
-	update-alternatives --remove uptime uptime.${PN}
-	update-alternatives --remove '[' 'lbracket.${PN}'
-}
+SRC_URI += "file://automake-version.patch;patch=1 \
+            file://man.patch;patch=1"
diff --git a/recipes/coreutils/coreutils_7.2.bb b/recipes/coreutils/coreutils_7.2.bb
index f80921a288..46333be148 100644
--- a/recipes/coreutils/coreutils_7.2.bb
+++ b/recipes/coreutils/coreutils_7.2.bb
@@ -1,89 +1,7 @@
-require coreutils.inc
+require coreutils-${PV}.inc
+require coreutils-target.inc
 
-SRC_URI = "\
-  ftp://ftp.gnu.org/gnu/coreutils/coreutils-${PV}.tar.gz \
-  file://automake-version.patch;patch=1 \
-  file://man.patch;patch=1 \
-  file://coreutils-7.2-fix-sort-segfault.patch;patch=1 \
-  file://onceonly.m4 \
-"
+PR = "r0"
 
-# [ gets a special treatment and is not included in this
-bindir_progs = "basename cksum comm csplit cut df dir dircolors dirname du \
-		env expand expr factor fmt fold groups head hostid id install \
-		join link logname md5sum mkfifo nice nl nohup od paste pathchk \
-		pinky pr printenv printf ptx readlink seq sha1sum shred sort \
-		split stat sum tac tail tee test tr tsort tty unexpand uniq \
-		unlink users vdir wc who whoami yes \
-		"
-
-# hostname gets a special treatment and is not included in this
-base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill \
-		     ln ls mkdir mknod mv pwd rm rmdir sleep stty sync touch \
-		     true uname \
-		     "
-
-sbindir_progs= "chroot"
-
-do_configure_prepend() {
-	install -m 0644 ${WORKDIR}/onceonly.m4 ${S}/m4
-}
-
-do_install () {
-	autotools_do_install
-
-	# Renaming the utilities that should go in /usr/bin
-	for i in ${bindir_progs}; do mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /bin (FHS)
-	install -d ${D}${base_bindir}
-	for i in ${base_bindir_progs}; do mv ${D}${bindir}/$i ${D}${base_bindir}/$i.${PN}; done
-
-	# Renaming and moving the utilities that should go in /usr/sbin (FHS)
-	install -d ${D}${sbindir}
-	for i in ${sbindir_progs}; do mv ${D}${bindir}/$i ${D}${sbindir}/$i.${PN}; done
-
-	# [ requires special handling because [.coreutils will cause the sed stuff
-	# in update-alternatives to fail, therefore use lbracket - the name used
-	# for the actual source file.
-	mv ${D}${bindir}/[ ${D}${bindir}/lbracket.${PN}
-	# hostname and uptime separated. busybox's versions are preferred
-	if [ -e ${D}${bindir}/hostname ]; then
-		mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
-	fi
-	if [ -e ${D}${bindir}/uptime ]; then
-		mv ${D}${bindir}/uptime ${D}${bindir}/uptime.${PN}
-	fi
-}
-
-pkg_postinst_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --install ${bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --install ${base_bindir}/$i $i $i.${PN} 100; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --install ${sbindir}/$i $i $i.${PN} 100; done
-
-	# Special cases. uptime and hostname is broken, prefer busybox's version. [ needs to be treated separately.
-	update-alternatives --install ${bindir}/uptime uptime uptime.${PN} 10
-	update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 10
-	update-alternatives --install '${bindir}/[' '[' 'lbracket.${PN}' 100
-}
-
-pkg_prerm_${PN} () {
-	# The utilities in /usr/bin
-	for i in ${bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /bin
-	for i in ${base_bindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The utilities in /usr/sbin
-	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
-
-	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
-	update-alternatives --remove uptime uptime.${PN}
-	update-alternatives --remove '[' 'lbracket.${PN}'
-}
+SRC_URI += "file://automake-version.patch;patch=1 \
+            file://man.patch;patch=1"
-- 
cgit 1.2.3-korg


From 877f8c19536f671454e246f766bb7ac328fd4816 Mon Sep 17 00:00:00 2001
From: Klaus Kurzmann <mok@fluxnetz.de>
Date: Wed, 16 Dec 2009 23:17:16 +0100
Subject: task-shr-feed: add obex-data-server

Signed-off-by: Klaus Kurzmann <mok@fluxnetz.de>
---
 recipes/tasks/task-shr-feed.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 4b3e764d5e..66e78e057f 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "SHR Feed"
-PR = "r29"
+PR = "r30"
 PV = "1.0"
 LICENSE = "GPL"
 
@@ -63,6 +63,7 @@ RDEPENDS_${PN} += "\
 		edje-viewer \
 #		obexpush \
 #		obexftp \
+		obex-data-server \
 		mtpaint \
 		telepathy-python \
 		intone-video \
-- 
cgit 1.2.3-korg


From da29e9aaa051f40665f818fe5884725047288a2f Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Dec 2009 17:37:55 -0800
Subject: iptables_1.4.6.bb: Recipe for version 1.4.6.

* Switch to INC_PR.
* inherit autotools

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/checksums.ini                                 |  4 ++++
 .../iptables-1.4.6/netfilter_remove_ipt_DSCP.patch | 28 ++++++++++++++++++++++
 recipes/iptables/iptables.inc                      | 19 ++++++++-------
 recipes/iptables/iptables_1.3.8.bb                 |  2 +-
 recipes/iptables/iptables_1.4.6.bb                 |  6 +++++
 5 files changed, 50 insertions(+), 9 deletions(-)
 create mode 100644 recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch
 create mode 100644 recipes/iptables/iptables_1.4.6.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1f76481579..cf43c35f77 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -12798,6 +12798,10 @@ sha256=84ac04a28ae41e17df0f181d8bc0049ae7a83baae07296e890ea5977a2952318
 md5=0a9209f928002e5eee9cdff8fef4d4b3
 sha256=c5c8a091ed9a1fa2dab86b4d87719064b50c202e8503046f50f299a361e6211c
 
+[http://netfilter.org/projects/iptables/files/iptables-1.4.6.tar.bz2]
+md5=c67cf30e281a924def6426be0973df56
+sha256=6e732798cad62163d6e033aa52e22b771246556a230c0f66cd33fe69e96d72a4
+
 [ftp://ftp.debian.org/debian/pool/main/i/iptraf/iptraf_3.0.0-6.diff.gz]
 md5=fe0e2944addbd5803b42e91f7e4ec5d7
 sha256=5803c3f3653887896b75567daf617a8f200cecdd28beb870219b3954d9931efa
diff --git a/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch
new file mode 100644
index 0000000000..b833237c16
--- /dev/null
+++ b/recipes/iptables/iptables-1.4.6/netfilter_remove_ipt_DSCP.patch
@@ -0,0 +1,28 @@
+Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h
+===================================================================
+--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ECN.h	2009-12-15 22:05:04.713075521 -0800
++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ECN.h	2009-12-15 22:08:43.875470318 -0800
+@@ -8,9 +8,6 @@
+ */
+ #ifndef _IPT_ECN_TARGET_H
+ #define _IPT_ECN_TARGET_H
+-#include <linux/netfilter_ipv4/ipt_DSCP.h>
+-
+-#define IPT_ECN_IP_MASK	(~IPT_DSCP_MASK)
+ 
+ #define IPT_ECN_OP_SET_IP	0x01	/* set ECN bits of IPv4 header */
+ #define IPT_ECN_OP_SET_ECE	0x10	/* set ECE bit of TCP header */
+Index: iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h
+===================================================================
+--- iptables-1.4.6.orig/include/linux/netfilter_ipv4/ipt_ecn.h	2009-12-15 22:09:44.415445160 -0800
++++ iptables-1.4.6/include/linux/netfilter_ipv4/ipt_ecn.h	2009-12-15 22:09:58.523715835 -0800
+@@ -8,9 +8,6 @@
+ */
+ #ifndef _IPT_ECN_H
+ #define _IPT_ECN_H
+-#include <linux/netfilter_ipv4/ipt_dscp.h>
+-
+-#define IPT_ECN_IP_MASK	(~IPT_DSCP_MASK)
+ 
+ #define IPT_ECN_OP_MATCH_IP	0x01
+ #define IPT_ECN_OP_MATCH_ECE	0x10
diff --git a/recipes/iptables/iptables.inc b/recipes/iptables/iptables.inc
index 4868abb8ee..fd16f97b0a 100644
--- a/recipes/iptables/iptables.inc
+++ b/recipes/iptables/iptables.inc
@@ -6,24 +6,27 @@ LICENSE = "GPL"
 SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2"
 S = "${WORKDIR}/iptables-${PV}"
 
+INC_PR = "r5"
+
 PARALLEL_MAKE = ""
 
 export COPT_FLAGS = "${CFLAGS}"
 export KERNEL_DIR = "${STAGING_INCDIR}"
 
-do_compile () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} NO_SHARED_LIBS=1
-}
+inherit autotools
+
+#do_compile () {
+#	oe_runmake DESTDIR=${D} NO_SHARED_LIBS=1
+#}
 
-do_install () {
-	unset CFLAGS
-	oe_runmake BINDIR=${D}${sbindir} LIBDIR=${D}${libdir} MANDIR=${D}${mandir} install NO_SHARED_LIBS=1
-}
+#do_install () {
+#	oe_runmake DESTDIR=${D} install NO_SHARED_LIBS=1
+#}
 
 PACKAGES =+ "${PN}-utils"
 FILES_${PN}-utils = "${sbindir}/iptables-save ${sbindir}/iptables-restore"
 FILES_${PN}-doc += "${mandir}"
+FILES_${PN}-dbg += "${libexecdir}/xtables"
 
 RRECOMMENDS = "\
   kernel-module-ip-tables \
diff --git a/recipes/iptables/iptables_1.3.8.bb b/recipes/iptables/iptables_1.3.8.bb
index 520e33624d..47c5564997 100644
--- a/recipes/iptables/iptables_1.3.8.bb
+++ b/recipes/iptables/iptables_1.3.8.bb
@@ -1,5 +1,5 @@
 require iptables.inc
-PR = "r5"
+PR = "${INC_PR}.0"
 
 SRC_URI += "\
   file://getsockopt-failed.patch;patch=1 \
diff --git a/recipes/iptables/iptables_1.4.6.bb b/recipes/iptables/iptables_1.4.6.bb
new file mode 100644
index 0000000000..433114ef87
--- /dev/null
+++ b/recipes/iptables/iptables_1.4.6.bb
@@ -0,0 +1,6 @@
+require iptables.inc
+PR = "${INC_PR}.0"
+
+SRC_URI += "\
+	file://netfilter_remove_ipt_DSCP.patch;patch=1 \
+	"
-- 
cgit 1.2.3-korg


From a68775b0728d89f6927ffe623889732862c629cd Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Wed, 16 Dec 2009 17:40:05 -0800
Subject: linux-libc-headers_2.6.32.bb: New recipe.

* Patch to export sa_family_t to userspace.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../export_sa_family_t.patch                       | 22 ++++++++++++++++++++++
 .../linux-libc-headers_2.6.32.bb                   |  1 +
 2 files changed, 23 insertions(+)
 create mode 100644 recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch

diff --git a/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch
new file mode 100644
index 0000000000..3c8137f2de
--- /dev/null
+++ b/recipes/linux-libc-headers/linux-libc-headers-2.6.32/export_sa_family_t.patch
@@ -0,0 +1,22 @@
+diff --git a/include/linux/socket.h b/include/linux/socket.h
+index 7b3aae2..ade87cf 100644
+--- a/include/linux/socket.h
++++ b/include/linux/socket.h
+@@ -16,6 +16,8 @@ struct __kernel_sockaddr_storage {
+ 				/* _SS_MAXSIZE value minus size of ss_family */
+ } __attribute__ ((aligned(_K_SS_ALIGNSIZE)));	/* force desired alignment */
+ 
++typedef unsigned short	sa_family_t;
++
+ #ifdef __KERNEL__
+ 
+ #include <asm/socket.h>			/* arch-dependent defines	*/
+@@ -34,8 +36,6 @@ extern void socket_seq_show(struct seq_file *seq);
+ # endif
+ #endif /* __KERNEL__ */
+ 
+-typedef unsigned short	sa_family_t;
+-
+ /*
+  *	1003.1g requires sa_family_t and that sa_data is char.
+  */
diff --git a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
index 6e1fdb0996..4b98f055a4 100644
--- a/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
+++ b/recipes/linux-libc-headers/linux-libc-headers_2.6.32.bb
@@ -7,6 +7,7 @@ PR = "r0"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+	   file://export_sa_family_t.patch;patch=1 \
 	  "
 S = "${WORKDIR}/linux-${PV}"
 
-- 
cgit 1.2.3-korg


From 727b276ed3d414662f19ec66e80f7b3dc029bca5 Mon Sep 17 00:00:00 2001
From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 17 Dec 2009 15:03:47 +0100
Subject: sane-srcrevs.inc: Bump shr apps to latest

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---
 conf/distro/include/sane-srcrevs.inc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 6f3a35fc90..bb81207118 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -14,7 +14,7 @@
 SRCREV_pn-accelges ?= "206"
 SRCREV_pn-advancedcaching ?= "9c3661f5573d2dd712437f1590070153d12e4c02"
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-alsa-scenarii-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-alsa-scenarii-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
 SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
@@ -79,7 +79,7 @@ SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-ffalarms ?= "67"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-fltk2 ?= "6671"
-SRCREV_pn-frameworkd-config-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5"
+SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
 SRCREV_pn-frameworkd-config-shr_SHR_REV ?= ${SRCREV_pn-frameworkd-config-shr}
 SRCREV_pn-fsod ?= "2a33e5ffe96c611e6a6b8b6c33d2a83ba656f55b"
 SRCREV_pn-fsoraw ?= "20"
@@ -138,9 +138,9 @@ SRCREV_pn-libmokopanelui2 ?= "4568"
 SRCREV_pn-libmokoui2 ?= "4695"
 SRCREV_pn-libnl2 ?= "dc273a12da9f0116e80fa81d63beb820e632dd17"
 SRCREV_pn-libowl ?= "277"
-SRCREV_pn-libphone-ui ?= "4455bce1643fcfba0538b17242f47935b869b159"
-SRCREV_pn-libphone-ui-shr ?= "29363d678d77182bde8c617ab7c56114150d6ff9"
-SRCREV_pn-libphone-utils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b"
+SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c"
+SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a"
+SRCREV_pn-libphone-utils ?= "665f27d6c3af092ae56f652c9fe6b5631b4d10db"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
@@ -248,7 +248,7 @@ SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opimd-utils ?= "0e7007fff120c8cc4c579c0c7e57883798e6d23e"
+SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420"
 SRCREV_pn-opkg ?= "446"
 SRCREV_pn-opkg-native ?= "446"
 SRCREV_pn-opkg-sdk ?= "446"
@@ -261,9 +261,9 @@ SRCREV_pn-osb-nrcit ?= "125"
 SRCREV_pn-osb-nrcore ?= "126"
 SRCREV_pn-packagekit ?= "96823118e98515dd41748e8c7bdb9cf7b1d4a95f"
 SRCREV_pn-paroli ?= "bb9fb1969acdfbaa48b55902675a6d8949014c6d"
-SRCREV_pn-phonefsod ?= "beb2fe989bfbf6b180a58d247db302082504fa01"
+SRCREV_pn-phonefsod ?= "76d8cc085946e77e3fc27ef12a9d18411324747b"
 SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
-SRCREV_pn-phoneuid ?= "19f40dcc6fdb442ea9f4d7521c60d68f4042977c"
+SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
@@ -296,7 +296,7 @@ SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
 SRCREV_pn-shr-launcher ?= "99"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
-SRCREV_pn-shr-specs ?= "a881cd133439737708d4d4d150500246ceff7c7d"
+SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca"
 SRCREV_pn-shr-splash ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-splash-theme-dontpanic ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-handy ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-- 
cgit 1.2.3-korg