Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

10 files changed, 5 insertions, 43 deletions

diff --git a/packages/udev/files/permissions.rules b/packages/udev/files/permissions.rules
index 86d771276b..efbe568a2b 100644
--- a/packages/udev/files/permissions.rules
+++ b/packages/udev/files/permissions.rules
@@ -11,7 +11,6 @@ BUS=="ide", KERNEL=="nht[0-9]*",				GROUP="tape"
 # SCSI devices
 BUS=="scsi", SYSFS{type}=="1",	GROUP="tape"
 BUS=="scsi", SYSFS{type}=="5",	GROUP="cdrom"
-BUS=="scsi", SYSFS{type}=="6",	GROUP="scanner"
 
 # USB devices
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
@@ -50,7 +49,6 @@ KERNEL=="inotify",	MODE="0666"
 KERNEL=="sgi_fetchop",	MODE="0666"
 KERNEL=="sonypi",	MODE="0666"
 KERNEL=="agpgart",	GROUP="video"
-KERNEL=="nvram",	GROUP="nvram"
 KERNEL=="rtc",		MODE="0660", GROUP="audio"
 
 KERNEL=="cdemu[0-9]*",	GROUP="cdrom"
diff --git a/packages/udev/udev-092/permissions.rules b/packages/udev/udev-092/permissions.rules
index 8da35c3090..99e03b1036 100644
--- a/packages/udev/udev-092/permissions.rules
+++ b/packages/udev/udev-092/permissions.rules
@@ -21,9 +21,7 @@ BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
 
 # SCSI devices
 BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
-BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
 BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
-BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
 
 # USB devices
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
@@ -70,18 +68,12 @@ KERNEL=="inotify",		MODE="0666"
 KERNEL=="sgi_fetchop",		MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",				GROUP="video"
-KERNEL=="nvram",				GROUP="nvram"
 KERNEL=="rtc",					GROUP="audio"
-KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
-KERNEL=="fuse",					GROUP="fuse"
 
 KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
 KERNEL=="pktcdvd",		MODE="0644"
 
-KERNEL=="uverbs*",				GROUP="rdma"
-KERNEL=="ucm*",					GROUP="rdma"
-
 # printers and parallel devices
 SUBSYSTEM=="printer",				GROUP="lp"
 SUBSYSTEM=="ppdev",				GROUP="lp"
diff --git a/packages/udev/udev-097/permissions.rules b/packages/udev/udev-097/permissions.rules
index 8da35c3090..99e03b1036 100644
--- a/packages/udev/udev-097/permissions.rules
+++ b/packages/udev/udev-097/permissions.rules
@@ -21,9 +21,7 @@ BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
 
 # SCSI devices
 BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
-BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
 BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
-BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
 
 # USB devices
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
@@ -70,18 +68,12 @@ KERNEL=="inotify",		MODE="0666"
 KERNEL=="sgi_fetchop",		MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",				GROUP="video"
-KERNEL=="nvram",				GROUP="nvram"
 KERNEL=="rtc",					GROUP="audio"
-KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
-KERNEL=="fuse",					GROUP="fuse"
 
 KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
 KERNEL=="pktcdvd",		MODE="0644"
 
-KERNEL=="uverbs*",				GROUP="rdma"
-KERNEL=="ucm*",					GROUP="rdma"
-
 # printers and parallel devices
 SUBSYSTEM=="printer",				GROUP="lp"
 SUBSYSTEM=="ppdev",				GROUP="lp"
diff --git a/packages/udev/udev-100/permissions.rules b/packages/udev/udev-100/permissions.rules
index 8da35c3090..99e03b1036 100644
--- a/packages/udev/udev-100/permissions.rules
+++ b/packages/udev/udev-100/permissions.rules
@@ -21,9 +21,7 @@ BUS=="ide", KERNEL=="nht[0-9]*",		GROUP="tape"
 
 # SCSI devices
 BUS=="scsi", SYSFS{type}=="1",			GROUP="tape"
-BUS=="scsi", SYSFS{type}=="3", SYSFS{vendor}=="HP", GROUP="scanner"
 BUS=="scsi", SYSFS{type}=="5",			GROUP="cdrom"
-BUS=="scsi", SYSFS{type}=="6",			GROUP="scanner"
 
 # USB devices
 BUS=="usb", KERNEL=="legousbtower*", MODE="0666"
@@ -70,18 +68,12 @@ KERNEL=="inotify",		MODE="0666"
 KERNEL=="sgi_fetchop",		MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",				GROUP="video"
-KERNEL=="nvram",				GROUP="nvram"
 KERNEL=="rtc",					GROUP="audio"
-KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
-KERNEL=="fuse",					GROUP="fuse"
 
 KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
 KERNEL=="pktcdvd",		MODE="0644"
 
-KERNEL=="uverbs*",				GROUP="rdma"
-KERNEL=="ucm*",					GROUP="rdma"
-
 # printers and parallel devices
 SUBSYSTEM=="printer",				GROUP="lp"
 SUBSYSTEM=="ppdev",				GROUP="lp"
diff --git a/packages/udev/udev-124/init b/packages/udev/udev-124/init
index b78a07b20f..9e11f08989 100644
--- a/packages/udev/udev-124/init
+++ b/packages/udev/udev-124/init
@@ -53,7 +53,7 @@ kill_udevd > "/dev/null" 2>&1
 		else
 			/sbin/udevadm trigger
 			/sbin/udevadm settle
-			(cd /; tar cf /etc/dev.tar /dev)
+			(cd /; tar cf /etc/dev.tar dev)
 		fi
 
 echo
diff --git a/packages/udev/udev-124/permissions.rules b/packages/udev/udev-124/permissions.rules
index 205b733292..940d163047 100644
--- a/packages/udev/udev-124/permissions.rules
+++ b/packages/udev/udev-124/permissions.rules
@@ -32,12 +32,8 @@ KERNEL=="nht[0-9]*", 				GROUP="tape"
 # SCSI devices
 KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode"
 SUBSYSTEMS=="scsi", ATTRS{type}=="1",				GROUP="tape"
-SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP",	GROUP="scanner"
-SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson",	GROUP="scanner"
-SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="EPSON",	GROUP="scanner"
 SUBSYSTEMS=="scsi", ATTRS{type}=="4",				GROUP="cdrom"
 SUBSYSTEMS=="scsi", ATTRS{type}=="5",				GROUP="cdrom"
-SUBSYSTEMS=="scsi", ATTRS{type}=="6",				GROUP="scanner"
 SUBSYSTEMS=="scsi", ATTRS{type}=="8",				GROUP="tape"
 
 # USB devices
@@ -86,22 +82,14 @@ KERNEL=="inotify",		MODE="0666"
 KERNEL=="sgi_fetchop",		MODE="0666"
 KERNEL=="sonypi",		MODE="0666"
 KERNEL=="agpgart",				GROUP="video"
-KERNEL=="nvram",				GROUP="nvram"
 KERNEL=="rtc|rtc[0-9]*",			GROUP="audio"
-KERNEL=="tpm*",			MODE="0600",	OWNER="tss", GROUP="tss"
-KERNEL=="fuse",					GROUP="fuse"
 KERNEL=="kqemu",		MODE="0666"
-KERNEL=="kvm",					GROUP="kvm"
 KERNEL=="tun",			MODE="0666",
 
 KERNEL=="cdemu[0-9]*",				GROUP="cdrom"
 KERNEL=="pktcdvd[0-9]*",			GROUP="cdrom"
 KERNEL=="pktcdvd",		MODE="0644"
 
-KERNEL=="uverbs*",				GROUP="rdma"
-KERNEL=="ucm*",					GROUP="rdma"
-KERNEL=="rdma_ucm",				GROUP="rdma"
-
 # printers and parallel devices
 SUBSYSTEM=="printer",				GROUP="lp"
 SUBSYSTEM=="ppdev",				GROUP="lp"
diff --git a/packages/udev/udev_092.bb b/packages/udev/udev_092.bb
index 37b95ca96a..d9f5cbaa68 100644
--- a/packages/udev/udev_092.bb
+++ b/packages/udev/udev_092.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."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r23"
+PR = "r24"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_097.bb b/packages/udev/udev_097.bb
index e9a26940b3..a3dfa51a21 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 = "r12"
+PR = "r13"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_100.bb b/packages/udev/udev_100.bb
index b0958c66b1..ef08aa4636 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 = "r14"
+PR = "r15"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \
diff --git a/packages/udev/udev_124.bb b/packages/udev/udev_124.bb
index 77e414ee11..a574014466 100644
--- a/packages/udev/udev_124.bb
+++ b/packages/udev/udev_124.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."
 RPROVIDES_${PN} = "hotplug"
 
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
 	   file://noasmlinkage.patch;patch=1 \