[oe-commits] Koen Kooi : udev 151 OE rules: update to drop deprecated options

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: d9e2b8c01e9bf358d29d98174fc0e1a24eb4ee14
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=d9e2b8c01e9bf358d29d98174fc0e1a24eb4ee14

Author: Koen Kooi <koen at openembedded.org>
Date:   Mon Feb 22 09:52:14 2010 +0100

udev 151 OE rules: update to drop deprecated options

---

 recipes/udev/udev-151/local.rules |    4 ++--
 recipes/udev/udev-151/udev.rules  |    4 ++--
 recipes/udev/udev_151.bb          |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/recipes/udev/udev-151/local.rules b/recipes/udev/udev-151/local.rules
index 4e80a71..da4b385 100644
--- a/recipes/udev/udev-151/local.rules
+++ b/recipes/udev/udev-151/local.rules
@@ -31,5 +31,5 @@ KERNEL=="fb0",  SYMLINK+="fb"
 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*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
-SUBSYSTEM=="input", KERNEL=="event[0-9]*", SYSFS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="input:*-e0*,3,*a0,1,*18,*", SYMLINK+="input/touchscreen0"
+SUBSYSTEM=="input", KERNEL=="event[0-9]*", ATTRS{modalias}=="ads7846", SYMLINK+="input/touchscreen0"
diff --git a/recipes/udev/udev-151/udev.rules b/recipes/udev/udev-151/udev.rules
index a19d4a0..60288c0 100644
--- a/recipes/udev/udev-151/udev.rules
+++ b/recipes/udev/udev-151/udev.rules
@@ -15,7 +15,7 @@
 
 # workaround for devices which do not report media changes
 SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \
-	ENV{ID_MODEL}=="IOMEGA_ZIP*",	NAME="%k", OPTIONS+="all_partitions"
+	ENV{ID_MODEL}=="IOMEGA_ZIP*", OPTIONS+="all_partitions"
 SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \
 	OPTIONS+="all_partitions"
 
@@ -103,7 +103,7 @@ SUBSYSTEM=="aoe", KERNEL=="revalidate",	NAME="etherd/%k"
 KERNEL=="dm-[0-9]*",		OPTIONS+="ignore_device"
 KERNEL=="device-mapper",	NAME="mapper/control"
 
-KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
+KERNEL=="rfcomm[0-9]*", GROUP="users", MODE="0660"
 
 # Firmware Helper
 ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware.sh"
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index 0764871..ee31b27 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,7 +3,7 @@ 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."
 LICENSE = "GPL"
 
-PR = "r2"
+PR = "r3"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"