[arch-commits] CVS update of core/base/udev (PKGBUILD arch-udev-rules.patch)

Fri Mar 21 22:05:16 UTC 2008

Date: Friday, March 21, 2008 @ 18:05:16
  Author: tpowa
    Path: /home/cvs-core/core/base/udev

Modified: PKGBUILD (1.160 -> 1.161) arch-udev-rules.patch (1.1 -> 1.2)

'upgpkg: update to new version,
fixed pnp device loading
fixed usb_id path in rules
http://bugs.archlinux.org/task/9867
http://bugs.archlinux.org/task/9885'


-----------------------+
 PKGBUILD              |   12 ++++++------
 arch-udev-rules.patch |   25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 10 deletions(-)


Index: core/base/udev/PKGBUILD
diff -u core/base/udev/PKGBUILD:1.160 core/base/udev/PKGBUILD:1.161

--- core/base/udev/PKGBUILD:1.160	Tue Mar 18 03:49:10 2008
+++ core/base/udev/PKGBUILD	Fri Mar 21 18:05:16 2008
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.160 2008/03/18 07:49:10 tpowa Exp $
+# $Id: PKGBUILD,v 1.161 2008/03/21 22:05:16 tpowa Exp $
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas BÃ¤chler <thomas at archlinux.org>
 pkgname=udev
-pkgver=118
-pkgrel=7
+pkgver=119
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -21,7 +21,7 @@
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
         migrate-udev start_udev 51-arch.rules load-modules.sh 
         cdrom-rules.patch cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch)
-md5sums=('39ab2404464c7026c65eb878827192b9'
+md5sums=('dd299c16371c9e14e52d79744bccf4c0'
          '49434a593918c822077bc3af765f1aff'
          'a68a519d1ed8cbbd2f45c23eb32ea218'
          '082e76ef9053495a5cade321817467cd'
@@ -30,7 +30,7 @@
          '8424b78e9dd772e75b4ef90814807815'
          '2d6dc6842464f107bccc68cd505a6c31'
          '780db5316a762dc5cdcf52027ab8a8eb'
-         '39028dcae66b03f6b39f58d41610968b')
+         'fab7fa68aa35f0595c0b2bd88c4dbfd9')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver
@@ -64,7 +64,7 @@
   # fix standard udev rules to fit to arch
   patch -Np0 -i $startdir/src/arch-udev-rules.patch || return 1
   # fix program paths in rules files
-  for i in vol_id cdrom_id ata_id scsi_id path_id edd_id; do
+  for i in vol_id cdrom_id ata_id scsi_id path_id edd_id usb_id; do
 	sed -i -e "s#$i#/lib/udev/$i#g" $startdir/pkg/etc/udev/rules.d/*
   done
   # fix modprobe rules to use the load-modules.sh
Index: core/base/udev/arch-udev-rules.patch
diff -u core/base/udev/arch-udev-rules.patch:1.1 core/base/udev/arch-udev-rules.patch:1.2
--- core/base/udev/arch-udev-rules.patch:1.1	Sun Mar  9 18:17:47 2008
+++ core/base/udev/arch-udev-rules.patch	Fri Mar 21 18:05:16 2008
@@ -1,6 +1,6 @@
 --- 50-udev-default.rules.old	2008-03-09 17:52:59.000000000 +0100
 +++ 50-udev-default.rules	2008-03-09 17:09:50.000000000 +0100
-@@ -4,13 +4,18 @@
+@@ -4,12 +4,17 @@
  KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]", GROUP="tty", MODE="0660", OPTIONS="last_rule"
  KERNEL=="ptmx",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
  KERNEL=="tty",			GROUP="tty", MODE="0666", OPTIONS="last_rule"
@@ -12,7 +12,6 @@
 +KERNEL=="vcsa",       GROUP="tty", NAME="vcc/a0", OPTIONS="last_rule"
 +KERNEL=="vcsa[0-9]*", GROUP="tty", NAME="vcc/a%n", OPTIONS="last_rule"
  KERNEL=="console",		MODE="0600", OPTIONS="last_rule"
- KERNEL=="tty0",			SYMLINK+="systty"
  
  # serial
  KERNEL=="tty[A-Z]*|pppox*|ircomm*|noz*", GROUP="uucp"
@@ -83,7 +82,7 @@
 +KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions", GROUP="floppy"
 +KERNEL=="fd[0-9]*", NAME="fd%n", SYMLINK+="floppy/%n fd%nu1440 fd%nu720 fd%nh1200 fd%nu360", GROUP="floppy"
  KERNEL=="sch[0-9]*",		GROUP="disk"
--KERNEL=="sg[0-9]*",		GROUP="disk", MODE="0640"
+-KERNEL=="sg[0-9]*",		ATTRS{type}!="3|6", GROUP="disk", MODE="0640"
  KERNEL=="ht[0-9]*|nht[0-9]*",	GROUP="disk"
  KERNEL=="pg[0-9]*",		GROUP="disk"
  KERNEL=="pt[0-9]*|npt[0-9]*",	GROUP="disk"
@@ -120,7 +119,7 @@
  # persistent storage links: /dev/disk/{by-id,by-uuid,by-label,by-path}
  # scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
  
--ACTION!="add", GOTO="persistent_storage_end"
+-ACTION!="add|change", GOTO="persistent_storage_end"
 +# needed like this!!!
 +ACTION!="add|change", GOTO="persistent_storage_end"
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
@@ -132,3 +131,21 @@
  
  # never access non-cdrom removable ide devices, the drivers are causing event loops on open()
  KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
+--- 80-drivers.rules~	2008-03-15 00:05:02.000000000 +0100
++++ 80-drivers.rules	2008-03-21 21:44:28.000000000 +0100
+@@ -3,10 +3,11 @@
+ ACTION!="add", GOTO="drivers_end"
+ 
+ DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
+-SUBSYSTEM=="pnp", DRIVER!="?*", ENV{MODALIAS}!="?*", \
+-  RUN{ignore_error}+="/bin/sh -c '/sbin/modprobe -a $$(while read id; do echo pnp:d$$id; done < /sys$devpath/id)'"
+-SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
+-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
++SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", DRIVER!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/load-modules.sh pnp:d$$id; /lib/udev/load-modules.sh pnp:c$$id ; done < /sys$devpath/id'"
++SUBSYSTEM=="tifm", RUN+="/sbin/modprobe tifm_sd"
++SUBSYSTEM=="tifm", RUN+="/sbin/modprobe tifm_ms"
++SUBSYSTEM=="memstick", RUN+="/sbin/modprobe ms_block"
++SUBSYSTEM=="memstick", RUN+="/sbin/modprobe mspro_block"
+ SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
+ SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
+ SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"


