5 files changed, 25 insertions, 7 deletions

diff --git a/meta/packages/udev/files/50-hostap_cs.rules b/meta/packages/udev/files/50-hostap_cs.rules
new file mode 100644
index 0000000000..efefdc58fc
--- /dev/null
+++ b/meta/packages/udev/files/50-hostap_cs.rules
@@ -0,0 +1,4 @@
+# hostap_cs needs ignore_cis_vcc=1 set - this should handle all cards
+#
+ACTION=="add", DEVICE=="hostap_cs", \
+ SYSFS{func_id}=="0x06", RUN+="/sbin/modprobe hostap_cs ignore_cis_vcc=1"
diff --git a/meta/packages/udev/udev-092/local.rules b/meta/packages/udev/udev-092/local.rules
index d053334652..2308b52c4a 100644
--- a/meta/packages/udev/udev-092/local.rules
+++ b/meta/packages/udev/udev-092/local.rules
@@ -28,4 +28,4 @@ KERNEL=="rtc0", SYMLINK+="rtc"
 ACTION=="add", DEVPATH=="/devices/*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}"
 
 # Create a symlink to any touchscreen input device
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*k*a0,1,*18,*", SYMLINK+="input/touchscreen0"
\ No newline at end of file
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="input:*-e0,1*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
diff --git a/meta/packages/udev/udev-092/udev.rules b/meta/packages/udev/udev-092/udev.rules
index 9c4ea4214d..c1834a9a1c 100644
--- a/meta/packages/udev/udev-092/udev.rules
+++ b/meta/packages/udev/udev-092/udev.rules
@@ -96,3 +96,7 @@ KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
 
 # Firmware Helper
 ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
+
+# Samsung UARTS
+KERNEL=="s3c2410_serial[0-9]"   NAME="ttySAC%n"
+
diff --git a/meta/packages/udev/udev.inc b/meta/packages/udev/udev.inc
index a3896a6978..5245d6e2b3 100644
--- a/meta/packages/udev/udev.inc
+++ b/meta/packages/udev/udev.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "udev is a program which dynamically creates and removes device nodes from \
+DESCRIPTION ?= "udev is a program which dynamically creates and removes device nodes from \
 /dev/. It responds to /sbin/hotplug device events and requires a 2.6 kernel."
 LICENSE = "GPL"
 
@@ -33,7 +33,8 @@ bindir = "/bin"
 sbindir = "/sbin"
 
 UDEV_EXTRAS = "<override me>"
-FILES_${PN} += "${usrbindir} ${usrsbindir}"
+FILES_${PN} += "${usrbindir}/* ${usrsbindir}/*"
+FILES_${PN}-dbg += "${usrbindir}/.debug ${usrsbindir}/.debug"
 EXTRA_OEMAKE = "-e \
                 'EXTRAS=${UDEV_EXTRAS}' \
                 'STRIP=echo'"
diff --git a/meta/packages/udev/udev_092.bb b/meta/packages/udev/udev_092.bb
index 794a525754..87febedf05 100644
--- a/meta/packages/udev/udev_092.bb
+++ b/meta/packages/udev/udev_092.bb
@@ -3,21 +3,26 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 RPROVIDES = "hotplug"
 
-PR = "r7"
+PR = "r11"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://noasmlinkage.patch;patch=1 \
            file://flags.patch;patch=1 \
            file://udevsynthesize.patch;patch=1 \
-           file://arm_inotify_fix.patch;patch=1 \
            file://udevsynthesize.sh \
-           file://mount.blacklist"
+           file://arm_inotify_fix.patch;patch=1 \
+           file://mount.blacklist \
+           "
+
+SRC_URI_append_h2200 = " file://50-hostap_cs.rules "
+PACKAGE_ARCH_h2200 = "h2200"
 
 require udev.inc
 
 INITSCRIPT_PARAMS = "start 03 S ."
 
-FILES_${PN} += "${base_libdir}"
+FILES_${PN} += "${base_libdir}/udev/*"
+FILES_${PN}-dbg += "${base_libdir}/udev/.debug"
 UDEV_EXTRAS = "extras/firmware/ extras/scsi_id/ extras/volume_id/ extras/run_directory/"
 EXTRA_OEMAKE += "libudevdir=/lib/udev"
 
@@ -48,3 +53,7 @@ do_install () {
         install -m 0755 ${S}/udevsynthesize ${D}${base_libdir}/udev/udevsynthesize
         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
+}