Merge changes from mainline OE to try and keep us in sync.

git-svn-id: https://svn.o-hand.com/repos/poky@127 311d38ba-8fff-0310-9ca6-ca027cbcb966

29 files changed, 140 insertions, 84 deletions

diff --git a/openembedded/packages/base-files/base-files/nokia770/fstab b/openembedded/packages/base-files/base-files/nokia770/fstab
index 4b6a5e1e1..68b56b63e 100644
--- a/openembedded/packages/base-files/base-files/nokia770/fstab
+++ b/openembedded/packages/base-files/base-files/nokia770/fstab
@@ -1,8 +1,6 @@
-rootfs  /               rootfs  defaults,errors=remount-ro,noatime      0 0
-/dev/mmcblk0p1  /media/card     auto defaults,noauto,noatime,exec,suid  0  0
-tmpfs           /var    tmpfs   defaults             0  0
-tmpfs           /media/ram      tmpfs   defaults        0  0
-rootfs               /                    auto       defaults              1 1
-proc                 /proc                proc       defaults              0 0
-devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
-usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
+rootfs          /               rootfs     defaults,errors=remount-ro,noatime  0 0
+/dev/mmcblk0p1  /media/card     auto       defaults,noauto,noatime,exec,suid   0 0
+tmpfs           /var            tmpfs      defaults             0  0
+tmpfs           /media/ram      tmpfs      defaults             0  0
+proc            /proc           proc       defaults             0  0
+usbdevfs        /proc/bus/usb   usbdevfs   noauto               0  0
diff --git a/openembedded/packages/base-files/base-files/simpad/fstab b/openembedded/packages/base-files/base-files/simpad/fstab
index f946c50c6..99b87714e 100644
--- a/openembedded/packages/base-files/base-files/simpad/fstab
+++ b/openembedded/packages/base-files/base-files/simpad/fstab
@@ -4,4 +4,4 @@ devpts               /dev/pts             devpts     mode=0620,gid=5       0 0
 usbdevfs             /proc/bus/usb        usbdevfs   noauto                0 0
 tmpfs		     /var		  tmpfs	     defaults		   0 0
 /dev/mtdblock/2	     /home		  jffs2	     defaults		   1 1
-
+/dev/hda1	     /mnt/cf		  auto	     noauto,owner	   0 0
diff --git a/openembedded/packages/hostap/files/hostap_cs.conf b/openembedded/packages/hostap/files/hostap_cs.conf
index 0b1bcf1a5..c5f46d8e7 100644
--- a/openembedded/packages/hostap/files/hostap_cs.conf
+++ b/openembedded/packages/hostap/files/hostap_cs.conf
@@ -167,3 +167,19 @@ card "ZCOMAX AirRunner/XI-300"
   manfid 0xd601, 0x0002
   bind "hostap_cs"
 
+card "Zonet ZCF1100"
+  manfid 0x000b, 0x7100
+  bind "hostap_cs"
+  
+card "Wireless LAN Adapter Version 01.02"
+   version "Wireless", "LAN Adapter", "Version 01.02"
+#   manfid 0x0156, 0x0002
+   bind "hostap_cs"
+
+card "Ambicom WL1100C 11Mbs Card 802.11b"
+  manfid 0xd601,0x0002
+  bind "hostap_cs"
+
+card "Sandisk Connect SDWCFB-000"
+  manfid 0xd601,0x0005
+  bind "hostap_cs"
diff --git a/openembedded/packages/hostap/hostap-modules_0.3.9.bb b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
index 1be1e6a77..435054c07 100644
--- a/openembedded/packages/hostap/hostap-modules_0.3.9.bb
+++ b/openembedded/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,7 +3,7 @@ SECTION = "kernel/modules"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r4"
+PR = "r6"
 
 SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
            file://hostap_cs.conf \
diff --git a/openembedded/packages/linux/linux-openzaurus.inc b/openembedded/packages/linux/linux-openzaurus.inc
index 68a90b290..907801a38 100644
--- a/openembedded/packages/linux/linux-openzaurus.inc
+++ b/openembedded/packages/linux/linux-openzaurus.inc
@@ -45,7 +45,14 @@ module_autoload_pxaficp_ir = "pxaficp_ir"
 
 do_configure() {
 
-	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+	case ${MACHINE} in
+		akita | spitz | borzoi )
+			install -m 0644 ${WORKDIR}/defconfig-cxx00 ${S}/.config || die "No default configuration for cxx00 available."
+			;;
+        	*)
+			install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+			;;
+	esac
 
 	if [ "${MACHINE}" == "collie" ]; then
 		mempos=`echo "obase=16; $mem * 1024 * 1024" | bc`
@@ -86,7 +93,7 @@ do_compile_append() {
 			size=`ls arch/${ARCH}/boot/${KERNEL_IMAGETYPE} -s | cut -d ' ' -f 1`
 			if [ $size -ge 1271 ]; then	
 				rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-				die "This kernel is too big for the c7x0 and will destroy your machine if you flash it!!!"
+				die "This kernel is too big for your PXA Zaurus and will destroy data if you flash it. Please reduce the size of the kernel by making more of it modular."
 			fi
 			;;
         	*)
diff --git a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
index 3b374340c..18eb8bb4a 100644
--- a/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
+++ b/openembedded/packages/linux/linux-openzaurus_2.6.14-rc1.bb
@@ -32,7 +32,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            ${RPSRC}/sharpsl_pm-r8.patch;patch=1 \
            ${RPSRC}/corgi_pm-r3.patch;patch=1 \
            ${RPSRC}/spitz_base_extras-r2.patch;patch=1 \
-           ${RPSRC}/spitz_pm-r3.patch;patch=1 \
+           ${RPSRC}/spitz_pm-r4.patch;patch=1 \
            ${RPSRC}/spitz_kbd_fix1-r0.patch;patch=1 \
            ${RPSRC}/spitzcf-r3.patch;patch=1 \
            ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
@@ -73,10 +73,10 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.tar.gz \
            file://dtl1_cs-add-socket-revE.patch;patch=1 \
            file://connectplus-remove-ide-HACK.patch;patch=1 \
            file://defconfig-c7x0 \
-           file://defconfig-ipaq-pxa-2.6 \
+           file://defconfig-ipaq-pxa270 \
            file://defconfig-collie \
            file://defconfig-poodle \
-           file://defconfig-spitz \
+           file://defconfig-cxx00 \
            file://defconfig-tosa "
 
 # These patches would really help collie/poodle but we 
diff --git a/openembedded/packages/matchbox-common/matchbox-common_svn.bb b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
index de1e20b87..d95167855 100644
--- a/openembedded/packages/matchbox-common/matchbox-common_svn.bb
+++ b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
@@ -8,9 +8,9 @@ DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http"
 
-inherit autotools  pkgconfig
+inherit autotools pkgconfig
 
-EXTRA_OECONF = "--enable-pda-folders"
+EXTRA_OECONF = " --enable-pda-folders "
 
 FILES_${PN} = "${bindir} \
 	       ${datadir}/matchbox/vfolders \
diff --git a/openembedded/packages/ncurses/ncurses.inc b/openembedded/packages/ncurses/ncurses.inc
index f400617dc..96679db0c 100644
--- a/openembedded/packages/ncurses/ncurses.inc
+++ b/openembedded/packages/ncurses/ncurses.inc
@@ -33,14 +33,8 @@ export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}"
 export BUILD_LDFLAGS = ""
 export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"'
 
-do_stage () {
-	for i in libncurses libpanel libform libmenu; do
-		oe_libinstall -so -a -C lib $i ${STAGING_LIBDIR}
-	done
-	for h in ncurses_*.h curses.h eti.h form.h menu.h panel.h \
-		termcap.h term.h unctrl.h; do
-		       install -m 0644 include/$h ${STAGING_INCDIR}/
-	done
+do_stage() {
+	autotools_stage_all
 	ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
 	ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so
 	ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a
diff --git a/openembedded/packages/netbase/netbase_4.21.bb b/openembedded/packages/netbase/netbase_4.21.bb
index 3426d1ae9..4046e64d7 100644
--- a/openembedded/packages/netbase/netbase_4.21.bb
+++ b/openembedded/packages/netbase/netbase_4.21.bb
@@ -2,7 +2,7 @@ SECTION = "base"
 DESCRIPTION = "This package provides the necessary \
 infrastructure for basic TCP/IP based networking."
 LICENSE = "GPL"
-PR = "r6"
+PR = "r7"
 
 inherit update-rc.d
 
diff --git a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
index 60cae8785..8093e7d24 100644
--- a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
            file://makefile_fix.patch;patch=1 \
diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
index d42bc84e7..05b381a5f 100644
--- a/openembedded/packages/pcmcia-cs/files/arm/pcmcia
+++ b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
@@ -1,12 +1,19 @@
+module_id() {
+    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+}
+
+
 case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
   *XScale-PXA2*)
 
     case "`uname -r`" in
         2.4*)
 		PCIC=pxa_cs
+		DS=ds
 		;;
 	2.6*)
 		PCIC=pxa2xx_core
+		DS=pcmcia
 		;;
     esac
     ;;
@@ -19,12 +26,8 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
     ;;
 esac
 
-if grep -q iPAQ /proc/cpuinfo; then
-  case `module_id` in
-    "HP iPAQ H2200")
-	;;
-    *)
-	PCIC_EXTRA=h3600_generic_sleeve
-	;;
-  esac
-fi
+case `module_id` in
+  "HP iPAQ H3"* | "HP iPAQ H5"*)
+    PCIC_EXTRA=h3600_generic_sleeve
+    ;;
+esac
diff --git a/openembedded/packages/pcmcia-cs/files/network.conf b/openembedded/packages/pcmcia-cs/files/network.conf
index b35ec5c0f..51a38dd55 100644
--- a/openembedded/packages/pcmcia-cs/files/network.conf
+++ b/openembedded/packages/pcmcia-cs/files/network.conf
@@ -3,4 +3,11 @@ manfid 0x0149, 0xc1ab
 version "Fast Ethernet", "CF Size PC Card", "1.0"
 bind "pcnet_cs"
 
+card "Hawking 10/100 CF Fast Ethernet"
+  manfid 0x0149, 0xc1ab
+  bind "pcnet_cs"
 
+card "Billionton CFLA-100N 10/100 FastEthernet"
+  version "CF", "100Base-Ethernet", "V", "1.0"
+  manfid 0x021b, 0x0202
+  bind "pcnet_cs"
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 2aa41a6c3..dadf83053 100644
--- a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r19"
+PR = "r21"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://busybox.patch;patch=1 \
diff --git a/openembedded/packages/perl/perl-5.8.7/config.sh-armeb-linux b/openembedded/packages/perl/perl-5.8.7/config.sh-armeb-linux
index 155b5237a..de17bbf28 100644
--- a/openembedded/packages/perl/perl-5.8.7/config.sh-armeb-linux
+++ b/openembedded/packages/perl/perl-5.8.7/config.sh-armeb-linux
@@ -801,7 +801,7 @@ perl5='hostperl'
 perl=''
 perl_patchlevel=''
 perladmin='slug@thg-slug1.thg.se'
-perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s'
+perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc -lgcc_s $$($(CC) -print-libgcc-file-name)'
 perlpath='hostperl'
 pg='pg'
 phostname='hostname'
diff --git a/openembedded/packages/readline/readline_4.3.bb b/openembedded/packages/readline/readline_4.3.bb
index 234d697df..d0ff2a8d7 100644
--- a/openembedded/packages/readline/readline_4.3.bb
+++ b/openembedded/packages/readline/readline_4.3.bb
@@ -4,12 +4,11 @@ additional functions to maintain a list of previously-entered command lines, to
 lines, and perform csh-like history expansion on previous commands."
 SECTION = "libs"
 PRIORITY = "optional"
-MAINTAINER = "Greg Gilbert <greg@treke.net>"
 LICENSE = "GPLv2"
 DEPENDS += "ncurses"
 RPROVIDES_${PN} += "readline"
 LEAD_SONAME = "libreadline.so"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.cwru.edu/pub/bash/readline-${PV}.tar.gz \
 	   file://shlink-termcap.patch;patch=1 \
@@ -23,24 +22,13 @@ do_configure () {
 	autotools_do_configure
 }
 
+do_stage() {
+	autotools_stage_all
+}
+
 do_install () {
 	autotools_do_install
 	# Make install doesn't properly install these
 	oe_libinstall -so -C shlib libhistory ${D}${libdir}
 	oe_libinstall -so -C shlib libreadline ${D}${libdir}
 }
-
-do_stage() {
-	oe_libinstall -a libhistory ${STAGING_LIBDIR}
-	oe_libinstall -a libreadline ${STAGING_LIBDIR}
-	oe_libinstall -so -C shlib libhistory ${STAGING_LIBDIR}
-	oe_libinstall -so -C shlib libreadline ${STAGING_LIBDIR}
-
-	install -d ${STAGING_INCDIR}/readline
-	for f in readline.h chardefs.h keymaps.h history.h tilde.h rlstdc.h \
-	  rlconf.h rltypedefs.h
-	do
-		install -m 0644 $f ${STAGING_INCDIR}/readline/
-	done
-
-}
diff --git a/openembedded/packages/recordext/recordext_cvs.bb b/openembedded/packages/recordext/recordext_cvs.bb
index 42acd1098..b6e6ecf88 100644
--- a/openembedded/packages/recordext/recordext_cvs.bb
+++ b/openembedded/packages/recordext/recordext_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 LICENSE = "BSD-X"
 SECTION = "libs"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XRecord extension protocol bits"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=RecordExt"
diff --git a/openembedded/packages/tslib/tslib/h3900/tslib.sh b/openembedded/packages/tslib/tslib/h3900/tslib.sh
index c885ccc9d..be9448b1d 100644
--- a/openembedded/packages/tslib/tslib/h3900/tslib.sh
+++ b/openembedded/packages/tslib/tslib/h3900/tslib.sh
@@ -11,15 +11,7 @@ case `uname -r` in
 	;;
 *)
 	TSLIB_TSDEVICE=`detect-stylus --device`
-	case `module_id` in
-	"HP iPAQ H2200")
-		# h2200 needs special linearizing thing
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h2200
-		;;
-	*)
-		TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
-		;;
-	esac
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-h3600
 	;;
 esac
 
diff --git a/openembedded/packages/tslib/tslib/simpad/tslib.sh b/openembedded/packages/tslib/tslib/simpad/tslib.sh
index e87a2095c..8bb94a037 100644
--- a/openembedded/packages/tslib/tslib/simpad/tslib.sh
+++ b/openembedded/packages/tslib/tslib/simpad/tslib.sh
@@ -1,5 +1,15 @@
 #!/bin/sh
 
-TSLIB_TSDEVICE=/dev/input/event0
+case `uname -r` in
+2.4*)
+	TSLIB_TSDEVICE=/dev/touchscreen/ucb1x00
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad-2.4
+	;;
+*)
+	TSLIB_TSDEVICE=/dev/input/event0
+	TSLIB_CONFFILE=/usr/share/tslib/ts.conf-simpad
+	;;
+esac
+
+export TSLIB_TSDEVICE TSLIB_CONFFILE
 
-export TSLIB_TSDEVICE
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad b/openembedded/packages/tslib/tslib/ts.conf-simpad
new file mode 100644
index 000000000..09309719f
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-simpad
@@ -0,0 +1,5 @@
+module_raw input
+module pthres pmin=1
+module variance delta=30
+module dejitter delta=100
+module linear
diff --git a/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4 b/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4
new file mode 100644
index 000000000..035e794cb
--- /dev/null
+++ b/openembedded/packages/tslib/tslib/ts.conf-simpad-2.4
@@ -0,0 +1,5 @@
+module_raw ucb1x00
+module pthres pmin=1
+module variance delta=10
+module dejitter delta=150
+module linear
diff --git a/openembedded/packages/tslib/tslib_cvs.bb b/openembedded/packages/tslib/tslib_cvs.bb
index 5c52147e1..0a79a492a 100644
--- a/openembedded/packages/tslib/tslib_cvs.bb
+++ b/openembedded/packages/tslib/tslib_cvs.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 DESCRIPTION = "tslib is a touchscreen access library."
 PV = "0.0cvs${CVSDATE}"
-PR = "r31"
+PR = "r32"
 
 SRC_URI_OVERRIDES_PACKAGE_ARCH = "0"
 PACKAGE_ARCH_tslib-conf = "${MACHINE}"
@@ -9,8 +9,9 @@ PACKAGE_ARCH_mnci = "${MACHINE}"
 
 SRC_URI = "cvs://cvs:@pubcvs.arm.linux.org.uk/mnt/src/cvsroot;module=tslib \
 	   file://ts.conf \
-	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h2200 file://ts.conf-h6300 \
+	   file://ts.conf-h3600 file://ts.conf-h3600-2.4 file://ts.conf-h6300 \
 	   file://ts.conf-corgi file://ts.conf-corgi-2.4 \
+	   file://ts.conf-simpad file://ts.conf-simpad-2.4 \
 	   file://tslib.sh"
 SRC_URI_append_mnci += " file://devfs.patch;patch=1"
 SRC_URI_append_mnci += " file://event1.patch;patch=1"
@@ -40,9 +41,9 @@ do_install_append() {
 	install -d ${D}${sysconfdir}/profile.d/
 	install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/
 	case ${MACHINE} in
-	h3600 | h3900 | h1940 | h6300 | ipaq-pxa270)
+	h3600 | h3900 | h1940 | h6300 | h2200 | ipaq-pxa270)
 		install -d ${D}${datadir}/tslib
-		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h2200 ts.conf-h6300; do
+		for f in ts.conf-h3600 ts.conf-h3600-2.4 ts.conf-h6300; do
 			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
@@ -54,6 +55,13 @@ do_install_append() {
 		done
 		rm -f ${D}${sysconfdir}/ts.conf
 		;;
+	simpad )
+		install -d ${D}${datadir}/tslib
+		for f in ts.conf-simpad ts.conf-simpad-2.4; do
+			install -m 0644 ${WORKDIR}/$f ${D}${datadir}/tslib/
+		done
+		rm -f ${D}${sysconfdir}/ts.conf
+		;;
 	*)
 		;;
 	esac
diff --git a/openembedded/packages/udev/files/init b/openembedded/packages/udev/files/init
index c290661c7..6ad6fd581 100755
--- a/openembedded/packages/udev/files/init
+++ b/openembedded/packages/udev/files/init
@@ -52,7 +52,9 @@ mount_tmpfs() {
 
   mkdir -p /dev/.static/dev
   chmod 700 /dev/.static/
-  mount -n -o move /etc/udev /dev/.static/dev
+  # Make sure it's busybox mount we're using. util-linux mount doesn't handle
+  # -o move. 
+  busybox mount -n -o move /etc/udev /dev/.static/dev
 }
 
 # I hate this hack.  -- Md
diff --git a/openembedded/packages/udev/files/udev.rules b/openembedded/packages/udev/files/udev.rules
index 4fc82ba25..044ababa7 100644
--- a/openembedded/packages/udev/files/udev.rules
+++ b/openembedded/packages/udev/files/udev.rules
@@ -54,6 +54,8 @@ KERNEL=="issm*",		NAME="infiniband/%k"
 KERNEL=="uverbs*",		NAME="infiniband/%k"
 KERNEL=="ucm",			NAME="infiniband/%k"
 
+KERNEL=="buzzer",		NAME="misc/buzzer"
+
 # ALSA devices
 KERNEL=="controlC[0-9]*",	NAME="snd/%k"
 KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
diff --git a/openembedded/packages/udev/udev_070.bb b/openembedded/packages/udev/udev_070.bb
index dfc20eb5b..e5f0409b1 100644
--- a/openembedded/packages/udev/udev_070.bb
+++ b/openembedded/packages/udev/udev_070.bb
@@ -6,7 +6,7 @@ SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 
 include udev.inc
 
-PR = "r3"
+PR = "r5"
 
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 
diff --git a/openembedded/packages/update-rc.d/update-rc.d-0.6/copyright.patch b/openembedded/packages/update-rc.d/update-rc.d-0.6/copyright.patch
index 3463247fe..bfe9cb818 100644
--- a/openembedded/packages/update-rc.d/update-rc.d-0.6/copyright.patch
+++ b/openembedded/packages/update-rc.d/update-rc.d-0.6/copyright.patch
@@ -10,7 +10,7 @@ diff -u -r1.6 -r1.7
  #
  # update-rc.d	Update the links in /etc/rc[0-9S].d/
  #
--# Phil Blundell <pb@nexus.co.uk> 2003-06-26
+-# Phil Blundell <pb@handhelds.org> 2003-06-26
 +# (c) 2003, 2004 Phil Blundell <pb@handhelds.org>
  #
 +# This program is free software; you can redistribute it and/or modify
diff --git a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
index b6ee79a19..33cda47f3 100644
--- a/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
+++ b/openembedded/packages/xcalibrateext/xcalibrateext_cvs.bb
@@ -1,7 +1,7 @@
 PV = "0.0cvs${CVSDATE}"
 SECTION = "x11/libs"
 LICENSE = "BSD-X"
-MAINTAINER = "Phil Blundell <pb@nexus.co.uk>"
+MAINTAINER = "Phil Blundell <pb@handhelds.org>"
 DESCRIPTION = "XCalibrate extension headers"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xlibs;module=XCalibrateExt"
diff --git a/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch
new file mode 100644
index 000000000..35ccadaa8
--- /dev/null
+++ b/openembedded/packages/xserver/xserver-kdrive/no-serial-probing.patch
@@ -0,0 +1,13 @@
+--- xserver/hw/kdrive/linux/mouse.c.orig	2004-05-13 14:25:51.000000000 -0700
++++ xserver/hw/kdrive/linux/mouse.c	2005-09-22 12:20:47.000000000 -0700
+@@ -927,8 +927,10 @@ char *kdefaultMouse[] =  {
+     "/dev/psaux",
+     "/dev/input/mice",
+     "/dev/adbmouse",
++#ifdef BREAK_MY_SERIAL_CONSOLE
+     "/dev/ttyS0",
+     "/dev/ttyS1",
++#endif
+ };
+ 
+ #define NUM_DEFAULT_MOUSE    (sizeof (kdefaultMouse) / sizeof (kdefaultMouse[0]))
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
index 53b704e36..65f142009 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb
@@ -20,7 +20,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r2"
+PR = "r4"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -35,18 +35,22 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
 	file://kmode.patch;patch=1 \
-	file://fbdev-not-fix.patch;patch=1"
+	file://fbdev-not-fix.patch;patch=1 "
 
-SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1 \
-                          file://devfs.patch;patch=1 \
-                          file://disable-apm.patch;patch=1"
-SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
-SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1"
-SRC_URI_append_ipaq-pxa270 = " file://disable-apm.patch;patch=1"
+SRC_URI_append_mnci   = 	" file://onlyfb.patch;patch=1 \
+                          	 file://devfs.patch;patch=1 \
+                          	 file://disable-apm.patch;patch=1"
+SRC_URI_append_poodle = 	" file://xserver-kdrive-poodle.patch;patch=1"
+SRC_URI_append_c7x0 = 		" file://disable-apm.patch;patch=1"
+SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1"
+SRC_URI_append_h3900 = 		" file://disable-apm.patch;patch=1"
+SRC_URI_append_h2200 =          " file://disable-apm.patch;patch=1"
 
 PACKAGE_ARCH_poodle = "poodle"
 PACKAGE_ARCH_c7x0 = "c7x0"
 PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270"
+PACKAGE_ARCH_h3900 = "h3900"
+PACKAGE_ARCH_h2200 = "h2200"
 
 S = "${WORKDIR}/xserver"
 
diff --git a/openembedded/packages/xserver/xserver-kdrive_20050624.bb b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
index 4031db9c2..78e77a23a 100644
--- a/openembedded/packages/xserver/xserver-kdrive_20050624.bb
+++ b/openembedded/packages/xserver/xserver-kdrive_20050624.bb
@@ -19,7 +19,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r10"
+PR = "r12"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
@@ -34,12 +34,14 @@ FILES_xserver-kdrive-xephyr = "${bindir}/Xephyr"
 
 SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver;date=${FIXEDCVSDATE} \
 	file://kmode.patch;patch=1 \
+	file://no-serial-probing.patch;patch=1 \
 	file://fbdev-not-fix.patch;patch=1"
 
 SRC_URI_append_mnci   = " file://onlyfb.patch;patch=1"
 SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1"
 PACKAGE_ARCH_poodle = "poodle"
 
+
 S = "${WORKDIR}/xserver"
 
 inherit autotools pkgconfig