[arch-commits] Commit in klibc-udev/trunk (PKGBUILD udev.rules udev_install)

[Thomas Baechler]

    Date: Monday, July 21, 2008 @ 14:47:23
  Author: thomas
Revision: 5858

upgpkg: klibc-udev 116-4

Modified:
  klibc-udev/trunk/PKGBUILD
  klibc-udev/trunk/udev.rules
  klibc-udev/trunk/udev_install

--------------+
 PKGBUILD     |    6 +++---
 udev.rules   |    8 ++++----
 udev_install |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-21 18:47:19 UTC (rev 5857)
+++ PKGBUILD	2008-07-21 18:47:23 UTC (rev 5858)
@@ -15,9 +15,9 @@
         vol_id-suspend2.patch)
 md5sums=('02c49d93ffda4a104c853c082138b835'
          'bcfed63882660e7d33f367d722e0a5c9'
-         '44747726599e90a2fa3db474bfc57a0e'
+         '92b62124dd43d61a2e610c305bf95d15'
          '22741baf8f5d7d8bc88022b39bca74d8'
-         '84797123003a7e6079aee9ac3291881a'
+         'f50bd6b378a5e75b2475bc67b32cb692'
          '1ecfeec15e88485e88f2e37f46861f2e'
          '80f75fc9a8fc32c7b8ff146d53bf579f')
 
@@ -31,7 +31,7 @@
   make VOLUME_ID_STATIC=true CC=klcc LD=klcc PROGRAMS="udevd udevsettle udevtrigger" \
         CFLAGS="$CFLAGS -U__CTYPE_NO_INLINE" \
         EXTRAS="extras/firmware extras/cdrom_id extras/ata_id \
-                extras/edd_id extras/scsi_id extras/usb_id extras/volume_id" \
+                extras/edd_id extras/usb_id extras/volume_id" \
         || return 1
 
   mkdir -p $startdir/pkg/lib/initcpio/udev

Modified: udev.rules
===================================================================
--- udev.rules	2008-07-21 18:47:19 UTC (rev 5857)
+++ udev.rules	2008-07-21 18:47:23 UTC (rev 5858)
@@ -107,10 +107,10 @@
 
 # needed like this!!!
 ACTION!="add|change", GOTO="persistent_storage_end"
-KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
+#KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
 
 # type 8 devices are "Medium Changers"
-KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+#KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 SUBSYSTEM!="block", GOTO="persistent_storage_end"
 
 # skip rules for inappropriate block devices
@@ -138,8 +138,8 @@
 
 KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394"
 KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", SUBSYSTEMS=="usb", IMPORT{program}="/lib/udev/usb_id --export %p"
-KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
-KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}!="?*", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
+#KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}!="?*", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
+#KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}!="?*", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
 KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
 KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"

Modified: udev_install
===================================================================
--- udev_install	2008-07-21 18:47:19 UTC (rev 5857)
+++ udev_install	2008-07-21 18:47:23 UTC (rev 5858)
@@ -16,7 +16,7 @@
     add_file /lib/initcpio/udev/ata_id /lib/udev/ata_id
     add_file /lib/initcpio/udev/usb_id /lib/udev/usb_id
     add_file /lib/initcpio/udev/edd_id /lib/udev/edd_id
-    add_file /lib/initcpio/udev/scsi_id /lib/udev/scsi_id
+    #add_file /lib/initcpio/udev/scsi_id /lib/udev/scsi_id
     add_file /lib/initcpio/udev/vol_id /lib/udev/vol_id
     add_file /lib/initcpio/udev/load-modules.sh /lib/udev/load-modules.sh
 }