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

59 files changed, 361 insertions, 242 deletions

diff --git a/packages/alsa/alsa-lib_1.0.15.bb b/packages/alsa/alsa-lib_1.0.15.bb
index 399352f299..4cf393843b 100644
--- a/packages/alsa/alsa-lib_1.0.15.bb
+++ b/packages/alsa/alsa-lib_1.0.15.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Alsa sound library"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "libs/multimedia"
 LICENSE = "GPL"
-PR = "1"
+PR = "r1"
 
 # configure.in sets -D__arm__ on the command line for any arm system
 # (not just those with the ARM instruction set), this should be removed,
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 09eddaeb6b..3956c4878b 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 4ef3cfeb66..346506c10d 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r17"
+PR = "r18"
 
 SRC_URI += "file://wget-long-options.patch;patch=1 \
 	   file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 14379a5da6..250802116a 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 31a2f1abe7..4742c87d1a 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r3"
+PR = "r4"
 
 DEFAULT_PREFERENCE = "-1"
 
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 53304df387..4d93394ff4 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://busybox-cron \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index e5c0f2473c..3db360423b 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
            file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/files/hwclock.sh b/packages/busybox/files/hwclock.sh
index 5acfb9fb24..aab5c054af 100644
--- a/packages/busybox/files/hwclock.sh
+++ b/packages/busybox/files/hwclock.sh
@@ -14,6 +14,8 @@
 
 . /etc/default/rcS
 
+[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime
+
 case "$1" in
         start)
                 if [ "$VERBOSE" != no ]
@@ -26,9 +28,9 @@ case "$1" in
 		then
 			if [ -z "$TZ" ]
 			then
-	                   hwclock --hctosys
+	                   hwclock --hctosys $UTC
 			else
-			   TZ="$TZ" hwclock --hctosys
+			   TZ="$TZ" hwclock --hctosys $UTC
 			fi
 		fi
 
@@ -51,7 +53,7 @@ case "$1" in
 		fi
 		if [ "$HWCLOCKACCESS" != no ]
 		then
-			hwclock --systohc
+			hwclock --systohc $UTC
 		fi
 		if [ "$VERBOSE" != no ]
 		then
@@ -62,7 +64,7 @@ case "$1" in
 	show)
 		if [ "$HWCLOCKACCESS" != no ]
 		then
-			hwclock --show
+			hwclock --show $UTC
 		fi
 		;;
         *)
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 8b995b3a70..64ef21cbd4 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -49,6 +49,7 @@ RDEPENDS_${PN}-x11 = "${PN}"
 RRECOMMENDS_${PN}-lib = "${PN}"
 RCONFLICTS_${PN} = "dbus-1"
 RREPLACES_${PN} = "dbus-1"
+RPROVIDES_${PN} = "dbus-1"
 
 PACKAGES =+ "${PN}-lib ${PN}-x11"
 
diff --git a/packages/dbus/dbus_1.0.3.bb b/packages/dbus/dbus_1.0.3.bb
index b3768ceb1e..6f71d062ce 100644
--- a/packages/dbus/dbus_1.0.3.bb
+++ b/packages/dbus/dbus_1.0.3.bb
@@ -1,4 +1,4 @@
 require dbus.inc
-PR = "r14"
+PR = "r15"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/dbus/dbus_1.2.1.bb b/packages/dbus/dbus_1.2.1.bb
index f5c07e3a91..e14523daaf 100644
--- a/packages/dbus/dbus_1.2.1.bb
+++ b/packages/dbus/dbus_1.2.1.bb
@@ -1,3 +1,3 @@
 include dbus.inc
 
-PR = "r8"
+PR = "r9"
diff --git a/packages/directfb/lite_0.9.26+cvs20070207.bb b/packages/directfb/lite_0.9.26+cvs20070207.bb
index 2f43627829..32f97bf962 100644
--- a/packages/directfb/lite_0.9.26+cvs20070207.bb
+++ b/packages/directfb/lite_0.9.26+cvs20070207.bb
@@ -9,7 +9,7 @@ LICENSE = "LGPL"
 
 # this is a CVS only release
 
-SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[9:]}"
+SRC_URI = "cvs://anonymous@cvs.directfb.org/cvs/directfb;method=pserver;module=lite;date=${@bb.data.getVar('PV', d, 1)[10:]}"
 
 S = "${WORKDIR}/lite"
 
diff --git a/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf
new file mode 100644
index 0000000000..3581064245
--- /dev/null
+++ b/packages/freesmartphone/frameworkd/eten-m800/frameworkd.conf
@@ -0,0 +1,38 @@
+[frameworkd]
+version = 1
+log_level = DEBUG
+log_to = syslog
+
+[odeviced.kernel26]
+# set 1 to disable the module
+disable = 0
+
+[odeviced.idlenotifier]
+# set 1 to disable the module
+disable = 1
+# add input nodes to ignore for idle activity
+ignoreinput = 2,3,4
+
+[odeviced.powercontrol-neo]
+disable = 1
+
+[ogsmd]
+disable = 1
+# specify your modemtype here
+
+[ogpsd]
+device = EtenDevice
+channel = SerialChannel
+path = /dev/ttySAC2
+
+[ogpsd.serialchannel]
+baudrate = 57600
+
+[opreferencesd]
+rootdir = ../etc/freesmartphone/opreferences:/etc/freesmartphone/opreferences:/usr/etc/freesmartphone/opreferences
+
+[oeventsd]
+rules_file = ../etc/freesmartphone/oevents/rules.yaml:/etc/freesmartphone/oevents/rules.yaml:/usr/etc/freesmartphone/oevents/rules.yaml
+
+[opimd]
+disable = 1
diff --git a/packages/glibc/glibc-2.3.6/etc/ld.so.conf b/packages/glibc/glibc-2.3.6/etc/ld.so.conf
new file mode 100644
index 0000000000..46e06d3f0a
--- /dev/null
+++ b/packages/glibc/glibc-2.3.6/etc/ld.so.conf
@@ -0,0 +1,2 @@
+/usr/local/lib
+
diff --git a/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch
new file mode 100644
index 0000000000..f05c04cb45
--- /dev/null
+++ b/packages/gpe-conf/gpe-conf-0.2.7/wifi-key.patch
@@ -0,0 +1,166 @@
+---
+ ChangeLog         |    4 ++++
+ modules/cfgfile.c |   49 +++++++++++++++++++++++++++++--------------------
+ 2 files changed, 33 insertions(+), 20 deletions(-)
+
+--- ChangeLog.orig
++++ ChangeLog
+@@ -1,5 +1,9 @@
++2008-12-18  Florian Boor <florian@kernelconcepts.de>
++
++	* cfgfile.c: Some fixes to wifi key string generation.
++
+ 2008-05-23      Florian Boor <florian.boor@kernelconcepts.de>
+ 
+ 	* Relase version 0.2.7
+ 	* Update translations
+ 
+--- modules/cfgfile.c.orig
++++ modules/cfgfile.c
+@@ -1,8 +1,8 @@
+ /*
+  *
+- * Copyright (C) 2002, 2003  Florian Boor <florian.boor@kernelconcepts.de>
++ * Copyright (C) 2002, 2003, 2008  Florian Boor <florian.boor@kernelconcepts.de>
+  *               2004  Ole Reinhardt <ole.reinhardt@kernelconcepts.de>
+  *
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version
+@@ -128,12 +128,10 @@ gint get_param_val(gchar* line, gchar* p
+ 	for (b=a+1;b<strlen(line);b++)
+ 		if ((line[b]=='\n') || (line[b]=='\0')) break;
+ 	param=strncpy(param,&line[st],sep-st);
+ 	param[sep-st]='\0';
+ 	
+-//KC-OR: changed because singe character values not recognized correctly
+-//		if ((b-a) > 0) value=strncpy(value,&line[a],b-a);	
+ 	if ((b-a) > 0) value=strncpy(value,&line[a],b-a);	
+ 	value[b-a]='\0';
+ 	return 0;
+ }
+ 
+@@ -562,15 +560,17 @@ gchar *get_iflist()
+ 		strncat(result," ",255);
+ 	}
+ 	return result;
+ }
+ 
+-void get_wifikey_string(NWInterface_t iface, char* key)
++void get_wifikey_string(NWInterface_t iface, gchar** key)
+ {
+ 	gint nokeys = FALSE;
+ 	gint count;
+ 	gchar temp[42];
++	gchar *lkey = g_strdup(""), *t;
++
+ 	
+ 	if ((strlen(iface.key[0]) == 0) && 
+ 	    (strlen(iface.key[1]) == 0) && 
+ 	    (strlen(iface.key[2]) == 0) && 
+ 	    (strlen(iface.key[3]) == 0)) 
+@@ -581,29 +581,36 @@ void get_wifikey_string(NWInterface_t if
+ 	
+ 	if (strlen(iface.key[iface.keynr-1]) == 0)
+ 		for (iface.keynr = 1; iface.keynr <=4; iface.keynr++)
+ 			if (strlen(iface.key[iface.keynr-1]) != 0) break;
+ 				
+-	switch (iface.encmode)
+-	{
+-		case ENC_OFF: strcpy(key, "off"); break;
+-		case ENC_OPEN: strcpy(key, "open"); break;
+-		case ENC_RESTRICTED: strcpy(key, "restricted"); break;
+-	}
+-	
+ 	if (!nokeys)
+ 	{
+ 		for (count = 0; count < 4; count++)
+ 			if (strlen(iface.key[count]) > 0)
+ 			{
+-				sprintf(temp, " key %s [%d]", iface.key[count], count+1);
+-				strcat(key, temp);
++				t = lkey;
++				lkey = g_strdup_printf("%s key %s [%d]", lkey, iface.key[count], count+1);
++				g_free(t);
+ 			}
+ 		
+-		sprintf(temp, " key [%d]", iface.keynr);
+-		strcat(key, temp);
++		t = lkey;
++		lkey = g_strdup_printf(" %s key [%d]", lkey, iface.keynr);
++		g_free(t);
+ 	}
++
++	t = lkey;
++	switch (iface.encmode)
++	{
++		case ENC_OPEN: lkey = g_strdup_printf ("%s key open", lkey); break;
++		case ENC_RESTRICTED: lkey = g_strdup_printf("%s key restricted", lkey); break;
++		case ENC_OFF: lkey = g_strdup_printf("%s key off", lkey); break;
++		default: lkey = g_strdup_printf("%s key off", lkey); break;
++	}
++	g_free(t);
++
++ 	*key = lkey;
+ }
+ 
+ gint write_sections()
+ {
+ 	gint i,j;
+@@ -613,11 +620,11 @@ gint write_sections()
+ 	gchar paramval[255];
+ 	gchar ifname[255];
+ 	gint svd[14];
+ 	gint lastwpos = 0;
+ 	gint last_i;
+-	gchar key[128];
++	gchar *key;
+ 	
+ 	for (i=0;i<configlen;i++)
+ 	{
+ 		get_param_val(configtext[i],paramval,ifname);	// get next tokens
+ 		/* handled by hotplug
+@@ -724,12 +731,13 @@ gint write_sections()
+ 				svd[Swifichannel] = TRUE;
+ 				lastwpos = i;
+ 			} else
+ 			if (!strcmp("wireless_key", paramval))
+ 			{
+-				get_wifikey_string(iflist[l-1], key);
++				get_wifikey_string(iflist[l-1], &key);
+ 				configtext[i] = subst_val(configtext[i], key); 
++ 				g_free(key);
+ 				svd[Swifikey] = TRUE;
+ 				lastwpos = i;
+ 			}
+ 			
+ 		} // else
+@@ -807,11 +815,11 @@ gint write_sections()
+ 						add_line(lastwpos,outstr);
+ 						i++;
+ 					} 
+ 					if (!svd[Swifikey])
+ 					{
+-						get_wifikey_string(iflist[l-1], key);
++						get_wifikey_string(iflist[l-1], &key);
+ 						sprintf(outstr,"\twireless_key %s",key);
+ 						add_line(lastwpos,outstr);
+ 						i++;
+ 					} 
+ 				}					
+@@ -884,12 +892,13 @@ gint write_sections()
+ 				if (strlen (iflist[i].channel) > 0)
+ 				{
+ 					sprintf(outstr,"\twireless_channel %s",iflist[i].channel);
+ 					add_line(configlen,outstr);
+ 				} 
+-				get_wifikey_string(iflist[i], key);
+-				sprintf(outstr,"\twireless_key %s",key);
++				get_wifikey_string(iflist[i], &key);
++ 				sprintf(outstr,"\twireless_key %s",key);
++				g_free(key);
+ 				add_line(configlen,outstr);
+ 			}					
+ 			
+ 		} //if status
+ 	
diff --git a/packages/gpe-conf/gpe-conf_0.2.7.bb b/packages/gpe-conf/gpe-conf_0.2.7.bb
index ec836eb068..2d4fb2168e 100644
--- a/packages/gpe-conf/gpe-conf_0.2.7.bb
+++ b/packages/gpe-conf/gpe-conf_0.2.7.bb
@@ -10,13 +10,14 @@ RDEPENDS_gpe-conf-panel = "gpe-conf"
 RPROVIDES_${PN} += " bl"
 RCONFLICTS_${PN} = "bl"
 
-PR = "r1"
+PR = "r2"
 
 GPE_TARBALL_SUFFIX = "bz2"
 
 inherit gpe autotools pkgconfig
 
-SRC_URI += "file://poweroff.patch;patch=1"
+SRC_URI += "file://poweroff.patch;patch=1 \
+            file://wifi-key.patch;patch=1;pnum=0"
 
 PACKAGES += "gpe-conf-panel"
 
diff --git a/packages/images/openmoko-asu-image.bb b/packages/images/openmoko-asu-image.bb
deleted file mode 100644
index e7307c73d0..0000000000
--- a/packages/images/openmoko-asu-image.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-#------------------------------------------------------
-# Openmoko Qtopia/X11 Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-IMAGE_INSTALL += "\
-                  task-openmoko-asu \
-                  task-openmoko-basic \
-                  "
diff --git a/packages/images/openmoko-base-image.bb b/packages/images/openmoko-base-image.bb
deleted file mode 100644
index 8acb0f5f90..0000000000
--- a/packages/images/openmoko-base-image.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-#------------------------------------------------------
-# Openmoko Base Image Recipe
-#------------------------------------------------------
-
-require openmoko-minimal-image.bb
-
-IMAGE_INSTALL += "task-openmoko-basic"
diff --git a/packages/linux/linux-2.6.26/boc01/012-081121-cy3218-btns.patch b/packages/linux/linux-2.6.26/boc01/012-081218-cy3218-btns.patch
index 51d092c528..d5985f3f0a 100644
--- a/packages/linux/linux-2.6.26/boc01/012-081121-cy3218-btns.patch
+++ b/packages/linux/linux-2.6.26/boc01/012-081218-cy3218-btns.patch
@@ -70,11 +70,11 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver
 +}
 +
 +unsigned short keymap[5] = {
-+		KEY_A,
-+		KEY_B,
-+		KEY_C,
-+		KEY_D,
-+		KEY_E,
++		KEY_UP,
++		KEY_F1,
++		KEY_ENTER,
++		KEY_DOWN,
++		KEY_BACKSPACE,
 +};
 +
 +static void handle_buttons(struct input_polled_dev *dev)
@@ -89,7 +89,7 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver
 +	if(uValue == MASK0)
 +	{
 +		report_key(idev, keymap[0]);
-+		printk("Bouton A\n");
++		printk("Bouton UP\n");
 +	}
 +
 +	uValue = i2c_smbus_read_byte_data(&capsense->client, CAP_STATE_GP0);
@@ -97,24 +97,24 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver
 +	if(uValue == MASK0)
 +	{
 +		report_key(idev, keymap[1]);
-+		printk("Bouton E\n");
++		printk("Bouton HELP\n");
 +	}
 +
 +	if(uValue == MASK1)
 +	{
 +		report_key(idev, keymap[2]);
-+		printk("Bouton B\n");
++		printk("Bouton OK\n");
 +	}
 +
 +	if(uValue == MASK2)
 +	{
 +		report_key(idev, keymap[3]);
-+		printk("Bouton C\n");
++		printk("Bouton DOWN\n");
 +	}
 +	if(uValue == MASK3)
 +	{
 +		report_key(idev, keymap[4]);
-+		printk("Bouton D\n");
++		printk("Bouton BACK\n");
 +	}
 +}
 +
@@ -167,8 +167,8 @@ diff -Nru linux-2.6.26.orig/drivers/input/misc/cy3218-btns.c linux-2.6.26/driver
 +	set_bit(EV_KEY, ipdev->input->evbit);
 +
 +
-+	for (i = 0; i < 3; i++)
-+			set_bit(keymap[i], ipdev->input->keybit);
++	for (i = 0; i < ARRAY_SIZE(keymap); i++)
++		set_bit(keymap[i], ipdev->input->keybit);
 +
 +	rc = input_register_polled_device(ipdev);
 +	if(rc)
diff --git a/packages/linux/linux-openmoko-devel/defconfig-oe b/packages/linux/linux-openmoko-devel/defconfig-oe
index b5d7e2f4df..32bcb9a52d 100644
--- a/packages/linux/linux-openmoko-devel/defconfig-oe
+++ b/packages/linux/linux-openmoko-devel/defconfig-oe
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.28-rc4
-# Sun Dec 14 16:59:01 2008
+# Thu Dec 18 22:58:51 2008
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -1823,7 +1823,11 @@ CONFIG_ROMFS_FS=y
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
 CONFIG_NETWORK_FILESYSTEMS=y
-# CONFIG_NFS_FS is not set
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+CONFIG_NFS_V3_ACL=y
+# CONFIG_NFS_V4 is not set
+CONFIG_ROOT_NFS=y
 CONFIG_NFSD=y
 CONFIG_NFSD_V2_ACL=y
 CONFIG_NFSD_V3=y
@@ -1843,6 +1847,7 @@ CONFIG_CIFS=m
 # CONFIG_CIFS_STATS is not set
 # CONFIG_CIFS_WEAK_PW_HASH is not set
 # CONFIG_CIFS_XATTR is not set
+# CONFIG_CIFS_POSIX is not set
 # CONFIG_CIFS_DEBUG2 is not set
 # CONFIG_CIFS_EXPERIMENTAL is not set
 # CONFIG_NCP_FS is not set
diff --git a/packages/linux/linux-openmoko-devel_git.bb b/packages/linux/linux-openmoko-devel_git.bb
index d3f5d3fdfe..91cae5cb97 100644
--- a/packages/linux/linux-openmoko-devel_git.bb
+++ b/packages/linux/linux-openmoko-devel_git.bb
@@ -8,7 +8,7 @@ DEFAULT_PREFERENCE = "-1"
 KERNEL_RELEASE = "2.6.27"
 KERNEL_VERSION = "${KERNEL_RELEASE}"
 
-OEV = "oe2"
+OEV = "oe3"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
 PR = "r0"
 
diff --git a/packages/linux/linux-openmoko.inc b/packages/linux/linux-openmoko.inc
index c986975851..278a01d5ee 100644
--- a/packages/linux/linux-openmoko.inc
+++ b/packages/linux/linux-openmoko.inc
@@ -56,9 +56,14 @@ do_deploy_append() {
 RDEPENDS_kernel-image += "mtd-utils"
 
 pkg_postinst_kernel-image () {
+
+# Get the lastest root file system value of boot args
+boot_arg=`cat /proc/cmdline |tr " " "\n"|grep "root=" |tail -n 1`
+has_mtdblock=`echo $boot_arg |grep mtdblock`
+
 if test "x$D" != "x"; then
         exit 1
-else
+elif test "empty$has_mtdblock" != "empty"; then
 	if [ -f ${sysconfdir}/default/flashkernel ] ; then
 		echo "Upgrading Kernel in Flash"
 		echo "DO NOT stop this process"
@@ -79,6 +84,8 @@ else
 	else
 		touch ${sysconfdir}/default/flashkernel
 	fi
+else
+        echo "You are not booting from NAND, don't flash kernel into mtdblock."
 fi
 }
 
diff --git a/packages/linux/linux-openmoko_2.6.24+git.bb b/packages/linux/linux-openmoko_2.6.24+git.bb
index 6f62b3dbdf..48b7effd55 100644
--- a/packages/linux/linux-openmoko_2.6.24+git.bb
+++ b/packages/linux/linux-openmoko_2.6.24+git.bb
@@ -8,7 +8,7 @@ KERNEL_VERSION = "${KERNEL_RELEASE}"
 
 OEV = "oe3"
 PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCREV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=stable \
diff --git a/packages/linux/linux_2.6.26.bb b/packages/linux/linux_2.6.26.bb
index c3fa981292..d15b22098d 100644
--- a/packages/linux/linux_2.6.26.bb
+++ b/packages/linux/linux_2.6.26.bb
@@ -1,6 +1,6 @@
 require linux.inc
 
-PR = "r4"
+PR = "r5"
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
@@ -23,7 +23,7 @@ SRC_URI_append_boc01 = "\
 	file://008-081127-spi.patch;patch=1 \
 	file://010-081105-mii.patch;patch=1 \
 	file://011-081202-gpio.patch;patch=1 \
-	file://012-081121-cy3218-btns.patch;patch=1 \
+	file://012-081218-cy3218-btns.patch;patch=1 \
 	file://013-081212-lcd.patch;patch=1 \
 	"
 
diff --git a/packages/meta/distro-feed-configs.bb b/packages/meta/distro-feed-configs.bb
index 5884f85c21..2540af9692 100644
--- a/packages/meta/distro-feed-configs.bb
+++ b/packages/meta/distro-feed-configs.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Configuration files for online package repositories aka feeds"
-PR = "r0"
+PR = "r1"
 
 DISTRO_FEED_PREFIX ?= "remote"
 DISTRO_FEED_URI ?= "http://my-distribution.example/remote-feed/"
diff --git a/packages/mokoko/mokoko_svn.bb b/packages/mokoko/mokoko_svn.bb
index 081c53ca88..f22d445ae8 100644
--- a/packages/mokoko/mokoko_svn.bb
+++ b/packages/mokoko/mokoko_svn.bb
@@ -6,7 +6,7 @@ DEPENDS = "gstreamer"
 RDEPENDS = "gstreamer"
 
 PV = "0.1+svnr${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://om-mediaplayer.googlecode.com/svn/;module=trunk;proto=http"
 
@@ -14,3 +14,4 @@ S = "${WORKDIR}/trunk/mokoko"
 
 inherit autotools
 
+FILES_${PN} += "${prefix}/etc/*"
diff --git a/packages/ncurses/ncurses.inc b/packages/ncurses/ncurses.inc
index 18c0722662..6d35467d8a 100644
--- a/packages/ncurses/ncurses.inc
+++ b/packages/ncurses/ncurses.inc
@@ -7,7 +7,9 @@ PACKAGES_prepend = "ncurses-tools "
 PACKAGES_append = " ncurses-terminfo"
 FILES_ncurses_append = " ${datadir}/tabset"
 RSUGGESTS_${PN} = "ncurses-terminfo"
-RPROVIDES = "libncurses5"
+RPROVIDES_${PN} = "libncurses5"
+RCONFLICTS_${PN} = "libncurses5"
+RREPLACES_${PN} = "libncurses5"
 
 inherit autotools
 
diff --git a/packages/ncurses/ncurses_5.4.bb b/packages/ncurses/ncurses_5.4.bb
index 2cd0cf0de0..451a180b39 100644
--- a/packages/ncurses/ncurses_5.4.bb
+++ b/packages/ncurses/ncurses_5.4.bb
@@ -1,4 +1,4 @@
-PR = "r15"
+PR = "r16"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz \
            file://makefile_tweak.patch;patch=1 \
diff --git a/packages/nfs-utils/nfs-utils_1.1.2.bb b/packages/nfs-utils/nfs-utils_1.1.2.bb
index 872a9bf8ff..353eb574ae 100644
--- a/packages/nfs-utils/nfs-utils_1.1.2.bb
+++ b/packages/nfs-utils/nfs-utils_1.1.2.bb
@@ -3,9 +3,9 @@ PRIORITY = "optional"
 SECTION = "console/network"
 LICENSE = "GPL"
 
-PR = "2"
+PR = "3"
 
-DEPENDS = "e2fsprogs tcp-wrappers libevent"
+DEPENDS = "e2fsprogs-libs tcp-wrappers libevent"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/nfs/nfs-utils-${PV}.tar.gz \
 	file://nfsserver \
diff --git a/packages/openmoko-projects/diversity-radar_svn.bb b/packages/openmoko-projects/diversity-radar_svn.bb
index 7a98d93afb..20228efd91 100644
--- a/packages/openmoko-projects/diversity-radar_svn.bb
+++ b/packages/openmoko-projects/diversity-radar_svn.bb
@@ -14,5 +14,3 @@ S = "${WORKDIR}/${PN}"
 inherit setuptools
 
 FILES_${PN} += "${prefix}/share/*"
-
-PKG_TAGS_${PN} = "group::communication alias::Diversity_Radar"
diff --git a/packages/openmoko-projects/om-locations_git.bb b/packages/openmoko-projects/om-locations_git.bb
index 9207502f2f..7ad0de950c 100644
--- a/packages/openmoko-projects/om-locations_git.bb
+++ b/packages/openmoko-projects/om-locations_git.bb
@@ -18,5 +18,3 @@ EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc"
 do_configure_prepend() {
        autopoint --force
 }
-
-PKG_TAGS_${PN} = "group::communication alias::Om_Locations"
diff --git a/packages/openmoko-projects/om-maps-low-levels_20080430.bb b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
index 24c57b6f21..29cfab068c 100644
--- a/packages/openmoko-projects/om-maps-low-levels_20080430.bb
+++ b/packages/openmoko-projects/om-maps-low-levels_20080430.bb
@@ -4,6 +4,5 @@ MAP_NAME = "low levels"
 require om-maps.inc
 
 
-PKG_TAGS_${PN} = "alias::${ALIAS_NAME_${PN}}"
 MAP_FN = "om-maps-low-levels-${PV}.eet"
 MAP_VER = "${PV}"
diff --git a/packages/openmoko-projects/om-maps.inc b/packages/openmoko-projects/om-maps.inc
index 36081bdcca..1caba01faf 100644
--- a/packages/openmoko-projects/om-maps.inc
+++ b/packages/openmoko-projects/om-maps.inc
@@ -11,8 +11,6 @@ FILES_${PN} = "${MAP_DIR}/${MAP_FN}"
 
 PACKAGES = "${PN}"
 PACKAGE_ARCH = "all"
-ALIAS_NAME_${PN}= "${@bb.data.getVar('MAP_NAME', d, 1).replace(' ','_')}"
-PKG_TAGS_${PN} = "group::maps alias::${ALIAS_NAME_${PN}}"
 
 do_install() {
         install -d ${D}${MAP_DIR}
diff --git a/packages/openmoko-projects/om-settings_svn.bb b/packages/openmoko-projects/om-settings_svn.bb
index 56b8e1d017..579dd3d1be 100644
--- a/packages/openmoko-projects/om-settings_svn.bb
+++ b/packages/openmoko-projects/om-settings_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Exposure all devices on neo1973"
 DEPENDS = "python-etk python-edbus"
 RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg"
 PV = "0.0.1+svnr${SRCREV}"
-PR = "r2.05"
+PR = "r3"
 PE = "1"
 
 S = "${WORKDIR}/trunk"
@@ -14,3 +14,12 @@ SRC_URI = "svn://svn.projects.openmoko.org/svnroot/exposure;module=trunk;proto=h
 
 PACKAGES = "${PN}"
 FILES_${PN} += "${prefix}/share/* ${sysconfdir}/X11/Xsession.d/*"
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if test "x$D" = "x"; then
+    killall exposure.py
+    sleep 1
+    exposure.py
+fi
+}
diff --git a/packages/openmoko-projects/openmoko-community-repository.bb b/packages/openmoko-projects/openmoko-community-repository.bb
index 45507233c0..5ddcb8d5bb 100644
--- a/packages/openmoko-projects/openmoko-community-repository.bb
+++ b/packages/openmoko-projects/openmoko-community-repository.bb
@@ -16,6 +16,4 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 CONFFILES_${PN} += "${sysconfdir}/opkg/Multiverse-feed.conf"
 
-PKG_TAGS_${PN} = "group::repos alias::Om_Multiverse"
-
 OPENMOKO_URI = "http://downloads.openmoko.org/repository"
diff --git a/packages/openmoko-projects/paroli-dialer.bb b/packages/openmoko-projects/paroli-dialer.bb
new file mode 100644
index 0000000000..ac20d79c79
--- /dev/null
+++ b/packages/openmoko-projects/paroli-dialer.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Paroli-dialer, a plugin of Tichy"
+HOMEPAGE = "http://code.google.com/p/paroli/"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS += "python-etk tichy"
+RDEPENDS += "tichy python-evas python-etk python-edje python-ecore python-edbus"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+S = "${WORKDIR}/paroli-dialer"
+
+SRC_URI = "svn://paroli.googlecode.com/svn/trunk/packages/;module=paroli-dialer;proto=http"
+
+inherit distutils
diff --git a/packages/openmoko-projects/paroli-gui.bb b/packages/openmoko-projects/paroli-gui.bb
new file mode 100644
index 0000000000..dc4b56a2d1
--- /dev/null
+++ b/packages/openmoko-projects/paroli-gui.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "Paroli-gui, a plugin of Tichy"
+HOMEPAGE = "http://code.google.com/p/paroli/"
+SECTION = "x11"
+LICENSE = "GPL"
+DEPENDS += "python-etk tichy"
+RDEPENDS += "tichy python-evas python-etk python-edje python-ecore python-edbus"
+PV = "0.1+svnr${SRCREV}"
+PR = "r0"
+S = "${WORKDIR}/paroli-gui"
+
+SRC_URI = "svn://paroli.googlecode.com/svn/trunk/packages/;module=paroli-gui;proto=http"
+
+inherit distutils
diff --git a/packages/openmoko-projects/pyefl-sudoku_svn.bb b/packages/openmoko-projects/pyefl-sudoku_svn.bb
index f44bc0755e..0eedc1bf58 100644
--- a/packages/openmoko-projects/pyefl-sudoku_svn.bb
+++ b/packages/openmoko-projects/pyefl-sudoku_svn.bb
@@ -16,5 +16,3 @@ inherit setuptools
 PACKAGES = "${PN}"
 
 FILES_${PN} += "${prefix}/share/*"
-
-PKG_TAGS_${PN} = "group::games alias::Pyefl_Sudoku"
diff --git a/packages/openmoko-system/ompower_git.bb b/packages/openmoko-system/ompower_svn.bb
index ff16910901..ff16910901 100644
--- a/packages/openmoko-system/ompower_git.bb
+++ b/packages/openmoko-system/ompower_svn.bb
diff --git a/packages/openmoko-tools/openmoko-set-root-password.bb b/packages/openmoko-tools/openmoko-set-root-password.bb
index 6176d4aef9..0bf6c990b4 100644
--- a/packages/openmoko-tools/openmoko-set-root-password.bb
+++ b/packages/openmoko-tools/openmoko-set-root-password.bb
@@ -3,7 +3,6 @@ SUMMARY = "On installation you will be prompted to set a root password. With \
 this password you can then log into the machine."
 LICENSE = "GPL"
 DEPENDS = "gtk+"
-PKG_TAGS_${PN} = "group::programming alias::Root_Password"
 
 SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http"
 S = "${WORKDIR}/root-password"
diff --git a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb b/packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb
index 60dab56569..e30d66b58a 100644
--- a/packages/openmoko-spaces/openmoko-toolchain-scripts_svn.bb
+++ b/packages/openmoko-tools/openmoko-toolchain-scripts_svn.bb
@@ -2,18 +2,21 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain."
 
 PV = "0.0+svnr${SRCREV}"
 PE = "1"
+PR = "r1"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=toolchain-scripts;proto=http"
 
 S = "${WORKDIR}/toolchain-scripts"
 
-FILES_${PN} = "/bin /scripts /* \
-"
-
 do_install () {
-	install -d ${D}/doc
-	cp -dr ${S}/* ${D}
-	find ${D} -name ".svn" | xargs rm -rf
-	rm -r ${D}/patches
-	cd ${D} ; mv COPYING COPYING.MIT LICENSE README doc ; mv setup-env bin 
+        install -d ${D}/${prefix}
+        cp -dr ${S}/* ${D}/${prefix}
+        find ${D} -name ".svn" | xargs rm -rf
+        rm -rf ${D}/${prefix}/patches
 }
+
+PACKAGE_ARCH = "all"
+
+FILES_${PN} = "/*"
+
+inherit sdk
diff --git a/packages/openmoko2/openmoko-calculator2_svn.bb b/packages/openmoko2/openmoko-calculator2_svn.bb
index f34b8ed7ff..b74287bcc2 100644
--- a/packages/openmoko2/openmoko-calculator2_svn.bb
+++ b/packages/openmoko2/openmoko-calculator2_svn.bb
@@ -12,5 +12,3 @@ do_install_append_openmoko() {
         install -d ${D}/${datadir}/pixmaps/
         install ${WORKDIR}//openmoko-calculator.png ${D}/${datadir}/pixmaps/openmoko-calculator.png
 }
-
-PKG_TAGS_${PN} = "group::unknown alias::Om_Calculator"
diff --git a/packages/openmoko2/openmoko-contacts2_svn.bb b/packages/openmoko2/openmoko-contacts2_svn.bb
index 203ced3924..2028076f00 100644
--- a/packages/openmoko2/openmoko-contacts2_svn.bb
+++ b/packages/openmoko2/openmoko-contacts2_svn.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Openmoko Address Book"
 SECTION = "openmoko/pim"
-PKG_TAGS_${PN} = "group::communication alias::Om_Contacts2"
 DEPENDS = "libmokoui2 libmokojournal2 dbus-glib"
 RDEPENDS = "libedata-book"
 PV = "0.1.0+svnr${SRCREV}"
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
index 7a1fb7a6ac..85740de653 100644
--- a/packages/openmoko2/openmoko-dates2_svn.bb
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -15,5 +15,3 @@ EXTRA_OECONF = "--with-frontend=openmoko"
 do_configure_prepend() {
 	touch gtk-doc.make
 }
-
-PKG_TAGS_${PN} = "group::communication alias::Om_Dates2"
diff --git a/packages/openmoko2/openmoko-dialer2_svn.bb b/packages/openmoko2/openmoko-dialer2_svn.bb
index 2d8bad42be..f382ee9b6f 100644
--- a/packages/openmoko2/openmoko-dialer2_svn.bb
+++ b/packages/openmoko2/openmoko-dialer2_svn.bb
@@ -1,6 +1,5 @@
 DESCRIPTION = "The Openmoko Dialer"
 SECTION = "openmoko/pim"
-PKG_TAGS_${PN} = "group::communication alias::Om_Dialer2"
 DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r9"
diff --git a/packages/openmoko2/openmoko-mediaplayer2_svn.bb b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
index 4addc51a55..56e20de125 100644
--- a/packages/openmoko2/openmoko-mediaplayer2_svn.bb
+++ b/packages/openmoko2/openmoko-mediaplayer2_svn.bb
@@ -23,4 +23,3 @@ fi
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule ${sysconfdir}/gconf/schemas/openmoko-mediaplayer.schemas > /dev/null
 }
-PKG_TAGS_${PN} = "group::unknown alias::Om_Mediaplayer2"
diff --git a/packages/openmoko2/openmoko-messages2_svn.bb b/packages/openmoko2/openmoko-messages2_svn.bb
index d68cd71c95..0fe5d7f0c3 100644
--- a/packages/openmoko2/openmoko-messages2_svn.bb
+++ b/packages/openmoko2/openmoko-messages2_svn.bb
@@ -3,7 +3,6 @@ SECTION = "openmoko/pim"
 DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana"
 PV = "0.1.0+svnr${SRCREV}"
 PR = "r2"
-PKG_TAGS_${PN} = "group::communication alias::Om_Messages2"
 
 inherit openmoko2
 
diff --git a/packages/opkg/opkg-sdk_svn.bb b/packages/opkg/opkg-sdk_svn.bb
index bff1d7cf4f..c28fe97591 100644
--- a/packages/opkg/opkg-sdk_svn.bb
+++ b/packages/opkg/opkg-sdk_svn.bb
@@ -1,8 +1,8 @@
 require opkg.inc
 
 DEPENDS = "curl-sdk"
-PR = "r1"
-
+PR = "r2"
+target_libdir := "${libdir}"
 inherit sdk
 
-EXTRA_OECONF += "--with-opkglibdir=${target_libdir}/opkg --disable-gpg"
+EXTRA_OECONF += "--with-opkglibdir=${target_libdir} --disable-gpg"
diff --git a/packages/tasks/task-openmoko-asu-feed.bb b/packages/tasks/task-openmoko-asu-feed.bb
deleted file mode 100644
index eb74500d57..0000000000
--- a/packages/tasks/task-openmoko-asu-feed.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Openmoko: Misc. Feed Items for ASU"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r0.08"
-
-inherit task
-
-RDEPENDS_task-openmoko-asu-feed = "\
-        xterm \
-        openmoko-agpsui \
-        task-openmoko-net \
-        task-openmoko-ui \
-        task-openmoko-base \
-        task-openmoko-phone \
-        task-openmoko-games \
-        task-openmoko-pim \
-"
diff --git a/packages/tasks/task-openmoko-asu.bb b/packages/tasks/task-openmoko-asu.bb
deleted file mode 100644
index 8ad6804a92..0000000000
--- a/packages/tasks/task-openmoko-asu.bb
+++ /dev/null
@@ -1,57 +0,0 @@
-DESCRIPTION = "Openmoko: Om 2008.8 August Software Update"
-
-SECTION = "openmoko/base"
-ALLOW_EMPTY = "1"
-LICENSE = "MIT"
-PR = "r3"
-
-inherit task
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES = "task-openmoko-asu"
-RDEPENDS_task-openmoko-asu = "\
-  bluez-hcidump \
-  readline \
-  connman \
-  connman-plugin-connman-resolvconf \
-  connman-plugin-connman-dhclient \
-  connman-plugin-connman-80211 \
-  connman-script-dhclient \
-  task-x11-illume \
-  assassin \
-  diversity-daemon \
-  om-locations \
-  om-maps-low-levels \
-  ${XSERVER} \
-  xserver-kdrive-common \
-  xserver-nodm-init \
-  xauth \
-  xhost \
-  xset \
-  xrandr \
-  libnotify \
-  om-settings \
-  etk-theme-ninja \
-  openmoko-community-repository \
-  assassin-thumbnail \
-"
-
-RDEPENDS_task-openmoko-asu_append_om-gta02 = "\
-  connman \
-  connman-plugin-dhclient \
-  connman-plugin-hal \
-  connman-plugin-ipv4 \
-  connman-plugin-netdev \
-  connman-plugin-resolvconf \
-  connman-plugin-resolvfile \
-  connman-plugin-rtnllink \
-  connman-plugin-wifi \
-  connman-script-dhclient \
-  pyefl-sudoku \
-  \
-# For supporting the om2007.2 stack
-  openmoko-icon-theme-standard2 \
-  moko-gtk-engine \
-  settings-daemon \
-  openmoko-asu-om20072-support \
-"
diff --git a/packages/tasks/task-openmoko-basic.bb b/packages/tasks/task-openmoko-basic.bb
deleted file mode 100644
index 237703a7d9..0000000000
--- a/packages/tasks/task-openmoko-basic.bb
+++ /dev/null
@@ -1,44 +0,0 @@
-DESCRIPTION = "Openmoko: Tasks for the Openmoko Linux Distribution"
-SECTION = "openmoko/base"
-LICENSE = "MIT"
-PR = "r0.05"
-
-inherit task
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PACKAGES = "task-openmoko-basic"
-
-DESCRIPTION_task-openmoko-qtopia-x11 = "Openmoko: Provide Window Manager, Om-settings and Om-installer"
-RDEPENDS_task-openmoko-basic = "\
-           readline \
-           connman \
-           connman-plugin-dhclient \
-           connman-plugin-hal \
-           connman-plugin-ipv4 \
-           connman-plugin-netdev \
-           connman-plugin-resolvconf \
-           connman-plugin-resolvfile \
-           connman-plugin-rtnllink \
-           connman-plugin-wifi \
-           connman-script-dhclient \
-           libnotify \
-# X
-
-# illume-theme-asu should be first than illume
-# to let opkg install illume-theme-asu first than illume-theme-freesmartphone
-# then we have ASU theme but not FSO theme in default.
-           task-x11-illume \
-           illume-theme-asu \
-           ${XSERVER} \
-           xserver-kdrive-common \
-           xserver-nodm-init \
-           xauth \
-           xhost \
-           xset \
-           xrandr \
-# Om applications
-           assassin \
-           assassin-thumbnail \
-           om-settings \
-           openmoko-community-repository \
-"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index dba92be4fd..197f775196 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -29,6 +29,8 @@ RDEPENDS_task-openmoko-feed = "\
   ntpclient ntp \
   openssh openssh-scp openssh-ssh openssh-sshd openssh-sftp openssh-misc \
   python python-pygtk python-pyserial python-gst python-pygame \
+  python-lightblue python-pybluez \
+  obexpush \
   ruby \
   libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
   settingsgui \
@@ -94,6 +96,7 @@ RDEPENDS_task-openmoko-feed = "\
   irssi \
   zsh \
   fbreader \
+  gzip \
   zip \
   firefox \
   tichy \
@@ -104,6 +107,7 @@ RDEPENDS_task-openmoko-feed = "\
   zhone \
   frameworkd \
   emacs \
+  gpe-scap \
 # for werner \
   net-tools \
   iproute2 \
diff --git a/packages/ttf-fonts/ttf-dejavu_2.23.bb b/packages/ttf-fonts/ttf-dejavu_2.23.bb
index c2d06c4d5e..d0ca64a3bd 100644
--- a/packages/ttf-fonts/ttf-dejavu_2.23.bb
+++ b/packages/ttf-fonts/ttf-dejavu_2.23.bb
@@ -5,7 +5,7 @@ HOMEPAGE = "http://dejavu.sourceforge.net/wiki/"
 LICENSE = "Bitstream Vera"
 RDEPENDS = "ttf-dejavu-common"
 RDEPENDS_ttf-dejavu-common = ""
-PR = "2"
+PR = "r2"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \
            file://30-dejavu-aliases.conf"
diff --git a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch b/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
index 8a625f21c2..974f564396 100644
--- a/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
+++ b/packages/uclibc/uclibc-0.9.30/ldso_hash.patch
@@ -1,19 +1,14 @@
-Index: uClibc-0.9.30/Rules.mak
+Index: uClibc-nptl/Rules.mak
 ===================================================================
---- uClibc-0.9.30.orig/Rules.mak	2008-11-15 16:35:00.713664783 +0100
-+++ uClibc-0.9.30/Rules.mak	2008-11-15 16:36:32.776988120 +0100
-@@ -519,13 +519,7 @@
- endif
+--- uClibc-nptl/Rules.mak	(revision 24450)
++++ uClibc-nptl/Rules.mak	(working copy)
+@@ -522,7 +522,8 @@
  
  ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
--# Be sure that binutils support it
+ # Be sure that binutils support it
 -LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
--ifeq ($(LDFLAGS_GNUHASH),)
--$(error Your binutils don't support --hash-style option, while you want to use it)
--else
--LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
--endif
-+LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
- endif
- 
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
++#LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
++LDFLAGS_GNUHASH:=--hash-style=gnu
+ ifeq ($(LDFLAGS_GNUHASH),)
+ $(error Your binutils don't support --hash-style option, while you want to use it)
+ else
diff --git a/packages/uclibc/uclibc-nptl/ldso_hash.patch b/packages/uclibc/uclibc-nptl/ldso_hash.patch
new file mode 100644
index 0000000000..974f564396
--- /dev/null
+++ b/packages/uclibc/uclibc-nptl/ldso_hash.patch
@@ -0,0 +1,14 @@
+Index: uClibc-nptl/Rules.mak
+===================================================================
+--- uClibc-nptl/Rules.mak	(revision 24450)
++++ uClibc-nptl/Rules.mak	(working copy)
+@@ -522,7 +522,8 @@
+ 
+ ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
+ # Be sure that binutils support it
+-LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
++#LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
++LDFLAGS_GNUHASH:=--hash-style=gnu
+ ifeq ($(LDFLAGS_GNUHASH),)
+ $(error Your binutils don't support --hash-style option, while you want to use it)
+ else
diff --git a/packages/uclibc/uclibc-nptl/uClibc.distro b/packages/uclibc/uclibc-nptl/uClibc.distro
index d51a29715a..853708014b 100644
--- a/packages/uclibc/uclibc-nptl/uClibc.distro
+++ b/packages/uclibc/uclibc-nptl/uClibc.distro
@@ -14,6 +14,7 @@ LDSO_BASE_FILENAME="ld.so"
 # UCLIBC_STATIC_LDCONFIG is not set
 LDSO_RUNPATH=y
 UCLIBC_CTOR_DTOR=y
+LDSO_GNU_HASH_SUPPORT=y
 # HAS_NO_THREADS is not set
 UCLIBC_HAS_THREADS=y
 UCLIBC_HAS_THREADS_NATIVE=y
@@ -133,7 +134,7 @@ CROSS_COMPILER_PREFIX=""
 UCLIBC_EXTRA_CFLAGS=""
 # DODEBUG is not set
 # DODEBUG_PT is not set
-DOSTRIP=y
+# DOSTRIP is not set
 # DOASSERTS is not set
 # SUPPORT_LD_DEBUG is not set
 # SUPPORT_LD_DEBUG_EARLY is not set
diff --git a/packages/uclibc/uclibc-svn/ldso_hash.patch b/packages/uclibc/uclibc-svn/ldso_hash.patch
index 8a625f21c2..974f564396 100644
--- a/packages/uclibc/uclibc-svn/ldso_hash.patch
+++ b/packages/uclibc/uclibc-svn/ldso_hash.patch
@@ -1,19 +1,14 @@
-Index: uClibc-0.9.30/Rules.mak
+Index: uClibc-nptl/Rules.mak
 ===================================================================
---- uClibc-0.9.30.orig/Rules.mak	2008-11-15 16:35:00.713664783 +0100
-+++ uClibc-0.9.30/Rules.mak	2008-11-15 16:36:32.776988120 +0100
-@@ -519,13 +519,7 @@
- endif
+--- uClibc-nptl/Rules.mak	(revision 24450)
++++ uClibc-nptl/Rules.mak	(working copy)
+@@ -522,7 +522,8 @@
  
  ifeq ($(LDSO_GNU_HASH_SUPPORT),y)
--# Be sure that binutils support it
+ # Be sure that binutils support it
 -LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
--ifeq ($(LDFLAGS_GNUHASH),)
--$(error Your binutils don't support --hash-style option, while you want to use it)
--else
--LDFLAGS_NOSTRIP += -Wl,$(LDFLAGS_GNUHASH)
--endif
-+LDFLAGS_NOSTRIP += -Wl,--hash-style=gnu
- endif
- 
- LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs
++#LDFLAGS_GNUHASH:=$(call check_ld,--hash-style=gnu)
++LDFLAGS_GNUHASH:=--hash-style=gnu
+ ifeq ($(LDFLAGS_GNUHASH),)
+ $(error Your binutils don't support --hash-style option, while you want to use it)
+ else
diff --git a/packages/uclibc/uclibc_0.9.30.bb b/packages/uclibc/uclibc_0.9.30.bb
index e3155f30fa..16e18fba97 100644
--- a/packages/uclibc/uclibc_0.9.30.bb
+++ b/packages/uclibc/uclibc_0.9.30.bb
@@ -7,7 +7,7 @@
 # on whether the base patches apply to the selected (SRCDATE) svn release.
 #
 UCLIBC_BASE ?= "0.9.30"
-PR = "r2"
+PR = "r3"
 DEFAULT_PREFERENCE = "1"
 
 require uclibc.inc
diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb
index dbb25f41f1..d261b50b5b 100644
--- a/packages/uclibc/uclibc_nptl.bb
+++ b/packages/uclibc/uclibc_nptl.bb
@@ -25,11 +25,13 @@ FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-nptl', '${FILE_DIRN
 #however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
 KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
 
-SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl \
+SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl;rev=${SRCREV} \
             file://uClibc.machine \
             file://uClibc.distro \
             file://uclibc-arm-ftruncate64.patch;patch=1 \
             file://arm_fix_alignment.patch;patch=1 \
             "
+SRC_URI_append_arm = " file://ldso_hash.patch;patch=1 "
+SRC_URI_append_armeb = " file://ldso_hash.patch;patch=1 "
 
 S = "${WORKDIR}/uClibc-nptl"