From af5b13bb6ca8e921d92721893933d2d595bd3913 Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@embeddedalley.com>
Date: Fri, 13 Feb 2009 11:30:29 -0500
Subject: udev-124: Sanitize permissions.rules and remove warning about leading
 /. We created /etc/dev.tar by 'tar cf /etc/dev.tar /dev' and then when we
 extract tar complains about a leading /, but since we do 'cd /;tar xf ..'
 drop the leading / in creation. Go and take out all of the GROUP='...' lines
 in permissions.rules for groups that we currently do not have, and no package
 addgroup's. Matches udev-118.

---
 packages/udev/udev-124/init              |  2 +-
 packages/udev/udev-124/permissions.rules | 12 ------------
 packages/udev/udev_124.bb                |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

(limited to 'packages/udev')

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_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 \
-- 
cgit v1.2.3