udev 151 OE rules: update to drop deprecated options

diff --git a/recipes/udev/udev-151/local.rules b/recipes/udev/udev-151/local.rules
index 4e80a71d80bcb7f0604cc58653b415401c637500..da4b38593c7ed2fb81d74188a145cef33cb36a74 100644 (file)
--- 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 a19d4a0bf65dde65175a0380dd345effac660ec8..60288c06ed5e952614b44488f4b783b88109aa46 100644 (file)
--- 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 07648711d6927d61c1f2daa6922627f7a29bb5fa..ee31b276048c9b0d1a392cc8c65aef1f4cbadfd2 100644 (file)
--- 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"