9 files changed, 34 insertions, 39 deletions
diff --git a/packages/udev/files/init b/packages/udev/files/init
index 8cbab188f0..a13b9afcd5 100755
--- a/packages/udev/files/init
+++ b/packages/udev/files/init
@@ -1,9 +1,9 @@
-#!/bin/sh -e
+#!/bin/sh
 
 UDEVSTART=/sbin/udevstart
 
 # defaults
-tmpfs_size="10M"
+tmpfs_size="2M"
 udev_root="/dev"
 
 [ -x $UDEVSTART ] || exit 0
diff --git a/packages/udev/udev-092/init b/packages/udev/udev-092/init
index 5a60d52a9a..42cb8ea2ce 100644
--- a/packages/udev/udev-092/init
+++ b/packages/udev/udev-092/init
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
@@ -119,7 +119,7 @@ PATH="/sbin:/bin:/usr/bin"
 [ -x /sbin/udevd ] || exit 0
 
 # defaults
-tmpfs_size="10M"
+tmpfs_size="2M"
 udev_root="/dev"
 udevd_timeout=30
 
diff --git a/packages/udev/udev-097/init b/packages/udev/udev-097/init
index cc25c026a3..ff2ad8ef73 100644
--- a/packages/udev/udev-097/init
+++ b/packages/udev/udev-097/init
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
@@ -131,7 +131,7 @@ warn_if_interactive() {
 PATH="/sbin:/bin:/usr/bin"
 
 # defaults
-tmpfs_size="10M"
+tmpfs_size="2M"
 udev_root="/dev"
 
 if [ -e /etc/udev/udev.conf ]; then
diff --git a/packages/udev/udev-100/init b/packages/udev/udev-100/init
index cc25c026a3..ff2ad8ef73 100644
--- a/packages/udev/udev-100/init
+++ b/packages/udev/udev-100/init
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 ### BEGIN INIT INFO
 # Provides:          udev
 # Required-Start:    mountvirtfs 
@@ -131,7 +131,7 @@ warn_if_interactive() {
 PATH="/sbin:/bin:/usr/bin"
 
 # defaults
-tmpfs_size="10M"
+tmpfs_size="2M"
 udev_root="/dev"
 
 if [ -e /etc/udev/udev.conf ]; then
diff --git a/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
new file mode 100644
index 0000000000..4076cb2dd6
--- /dev/null
+++ b/packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
+card one sweet day."
+PR = "r1"
+
+SRC_URI = " file://50-hostap_cs.rules "
+
+do_install() {
+	install -d ${D}${sysconfdir}/udev/rules.d/
+	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
+PACKAGE_ARCH = "all"
diff --git a/packages/udev/udev.inc b/packages/udev/udev.inc
index 32b9b28784..e9c83d4e5a 100644
--- a/packages/udev/udev.inc
+++ b/packages/udev/udev.inc
@@ -12,17 +12,12 @@ SRC_URI += " \
 	   file://local.rules \
            file://init"
 
-UDEV_DEVFS_RULES ?= "0"
+inherit update-rc.d autotools pkgconfig
 
-PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+PARALLEL_MAKE = ""
+UDEV_DEVFS_RULES ?= "0"
 PKG_libvolume-id-dev = "libvolume-id-dev"
 
-FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
-FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
-FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
-
-inherit update-rc.d autotools pkgconfig
-
 INITSCRIPT_NAME = "udev"
 INITSCRIPT_PARAMS = "start 04 S ."
 
@@ -37,8 +32,6 @@ bindir = "/bin"
 sbindir = "/sbin"
 
 UDEV_EXTRAS = "<override me>"
-FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
-FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 EXTRA_OEMAKE = "-e \
 		'EXTRAS=${UDEV_EXTRAS}' \
 		'STRIP=echo'"
@@ -68,3 +61,10 @@ do_install () {
 do_stage () {
 	autotools_stage_all
 }
+
+PACKAGES =+ "udev-utils libvolume-id libvolume-id-dev"
+FILES_libvolume-id-dev = "${includedir}/libvolume_id.h ${libdir}/libvolume_id.a ${libdir}/libvolume_id.so ${libdir}/pkgconfig/libvolume_id.pc"
+FILES_udev-utils = "${usrbindir}/udevinfo ${usrbindir}/udevtest"
+FILES_libvolume-id = "${base_libdir}/libvolume_id.so.*"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 7f6685d926..b946b98c56 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "udev is a daemon which dynamically creates and removes device nodes from \
 /dev/, handles hotplug events and loads drivers at boot time. It replaces \
 the hotplug package and requires a kernel not older than 2.6.12."
-RPROVIDES = "hotplug"
+RPROVIDES_${PN} = "hotplug"
 
-PR = "r16"
+PR = "r20"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -14,9 +14,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
 	   file://mount.blacklist \
 	   "
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
@@ -55,10 +52,6 @@ do_install () {
 	install -m 0755 ${WORKDIR}/udevsynthesize.sh ${D}${sbindir}/udevsynthesize
 }
 
-do_install_append_h2200() {
-	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
 pkg_postinst_append() {
 
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index 2af5556dbd..360e6019d5 100644
--- a/packages/udev/udev_097.bb
+++ b/packages/udev/udev_097.bb
@@ -8,7 +8,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r7"
+PR = "r10"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -18,9 +18,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
 
 require udev.inc
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 INITSCRIPT_PARAMS = "start 03 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index bef4cb7301..e4ef8395a6 100644
--- a/packages/udev/udev_100.bb
+++ b/packages/udev/udev_100.bb
@@ -9,7 +9,7 @@ used to detect the type of a file system and read its metadata."
 DESCRIPTION_libvolume-id-dev = "libvolume_id development headers, \
 needed to link programs with libvolume_id."
 
-PR = "r6"
+PR = "r9"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
@@ -19,9 +19,6 @@ SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz
 
 require udev.inc
 
-SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
-PACKAGE_ARCH_h2200 = "h2200"
-
 INITSCRIPT_PARAMS = "start 03 S ."
 
 FILES_${PN} += "${base_libdir}/udev/*"
@@ -56,10 +53,6 @@ do_install () {
 	install -d ${D}${base_libdir}/udev/
 }
 
-do_install_append_h2200() {
-	install -m 0644 ${WORKDIR}/50-hostap_cs.rules         ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
-}
-
 pkg_postinst_append() {
 
 	# Add the root partition to mount.blacklist to avoid a bug in the auto-mounter,