From 0f01196db2ed267128c18bd9ce8fe8e493b0dd6f Mon Sep 17 00:00:00 2001 From: Matt Housh Date: Wed, 3 May 2006 13:54:43 +0000 Subject: [PATCH] udev: updated to version 091 --- udev/.footprint | 13 +++++++++++++ udev/.md5sum | 4 ++-- udev/Pkgfile | 7 ++++--- udev/udev.rules | 6 +++--- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/udev/.footprint b/udev/.footprint index 94fc5bcc..8fda6a42 100644 --- a/udev/.footprint +++ b/udev/.footprint @@ -13,6 +13,8 @@ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/rules.d/50-udev.rules -rw-r--r-- root/root etc/udev/udev.conf drwxr-xr-x root/root lib/ +lrwxrwxrwx root/root lib/libvolume_id.so.0 -> libvolume_id.so.0.62.0 +-rwxr-xr-x root/root lib/libvolume_id.so.0.62.0 drwxr-xr-x root/root lib/udev/ -rwxr-xr-x root/root lib/udev/create_floppy_devices drwxr-xr-x root/root lib/udev/devices/ @@ -34,13 +36,22 @@ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/udevcontrol -rwxr-xr-x root/root sbin/udevd -rwxr-xr-x root/root sbin/udevsend +-rwxr-xr-x root/root sbin/udevsettle -rwxr-xr-x root/root sbin/udevstart +-rwxr-xr-x root/root sbin/udevtrigger -rwxr-xr-x root/root sbin/usb_id -rwxr-xr-x root/root sbin/vol_id drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/udevinfo -rwxr-xr-x root/root usr/bin/udevtest +drwxr-xr-x root/root usr/include/ +-rw-r--r-- root/root usr/include/libvolume_id.h +drwxr-xr-x root/root usr/lib/ +-rwxr-xr-x root/root usr/lib/libvolume_id.a +lrwxrwxrwx root/root usr/lib/libvolume_id.so -> /lib/libvolume_id.so.0.62.0 +drwxr-xr-x root/root usr/lib/pkgconfig/ +-rw-r--r-- root/root usr/lib/pkgconfig/libvolume_id.pc drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man7/ -rw-r--r-- root/root usr/man/man7/udev.7.gz @@ -53,8 +64,10 @@ lrwxrwxrwx root/root usr/man/man8/udevcontrol.8.gz -> udevd.8.gz -rw-r--r-- root/root usr/man/man8/udevinfo.8.gz -rw-r--r-- root/root usr/man/man8/udevmonitor.8.gz -rw-r--r-- root/root usr/man/man8/udevsend.8.gz +-rw-r--r-- root/root usr/man/man8/udevsettle.8.gz -rw-r--r-- root/root usr/man/man8/udevstart.8.gz -rw-r--r-- root/root usr/man/man8/udevtest.8.gz +-rw-r--r-- root/root usr/man/man8/udevtrigger.8.gz -rw-r--r-- root/root usr/man/man8/vol_id.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/udevmonitor diff --git a/udev/.md5sum b/udev/.md5sum index 4d2901c8..c7ae1ab7 100644 --- a/udev/.md5sum +++ b/udev/.md5sum @@ -1,3 +1,3 @@ a7d745a3f3b8e222b6957aefec1cdd2f start_udev -8659e14a4f376b33134c72df180bfbbe udev-087.tar.bz2 -40c08f72053eae0035f9c3da9418fc18 udev.rules +4151022ea7b4dcfaa768c1b7bf2ab9e5 udev-091.tar.bz2 +7d25125f0fd94546b676c3195237656b udev.rules diff --git a/udev/Pkgfile b/udev/Pkgfile index 8b681b43..f862b1cd 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -4,7 +4,7 @@ # Depends on: hotplug name=udev -version=087 +version=091 release=1 source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \ udev.rules start_udev) @@ -14,7 +14,7 @@ build() { sed -i -e 's/$(OPTIMIZATION)//' Makefile make \ USE_KLIBC=false \ - USE_LOG=false \ + USE_LOG=true \ DEBUG=false \ EXTRAS="extras/scsi_id extras/volume_id extras/ata_id extras/run_directory extras/usb_id extras/floppy extras/cdrom_id extras/firmware" \ udevdir="/dev" \ @@ -27,8 +27,9 @@ build() { install -m 0644 $SRC/udev.rules \ $PKG/etc/udev/rules.d/50-udev.rules install -D -m 0755 $SRC/start_udev $PKG/sbin/start_udev - install extras/path_id extras/floppy/create_floppy_devices \ + install extras/path_id/path_id extras/floppy/create_floppy_devices \ extras/firmware/firmware_helper $PKG/sbin/ + mv $PKG/lib/udev/*_id $PKG/sbin/ mkdir -p $PKG/etc/hotplug.d/default ln -s /sbin/udevsend $PKG/etc/hotplug.d/default/10-udev.hotplug mkdir -p $PKG/etc/dev.d/{default,net} diff --git a/udev/udev.rules b/udev/udev.rules index 668558ee..4662dd01 100644 --- a/udev/udev.rules +++ b/udev/udev.rules @@ -34,9 +34,9 @@ SUBSYSTEM=="block", GROUP="disk" # cdrom symlinks and other good cdrom naming BUS=="ide", KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode" -BUS=="scsi", KERNEL="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode" -BUS=="scsi", KERNEL="scd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode" -BUS=="scsi", KERNEL="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="disk" +BUS=="scsi", KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode" +BUS=="scsi", KERNEL=="scd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode" +BUS=="scsi", KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="disk" ENV{ID_CDROM}=="?*", SYMLINK+="cdrom%e", GROUP="disk" ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cdrw%e" ENV{ID_CDROM_DVD}=="?*", SYMLINK+="dvd%e"