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

[Aaron Griffin]

    Date: Thursday, August 28, 2008 @ 11:38:35
  Author: aaron
Revision: 10377

Remove modprobe from rules
Add md5sums

Modified:
  udev/trunk/PKGBUILD
  udev/trunk/arch-udev-rules.patch

-----------------------+
 PKGBUILD              |   23 +++++++++++++----------
 arch-udev-rules.patch |    9 ++++++---
 2 files changed, 19 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-08-28 14:08:03 UTC (rev 10376)
+++ PKGBUILD	2008-08-28 15:38:35 UTC (rev 10377)
@@ -3,13 +3,14 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
 pkgver=126
-pkgrel=1
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
 groups=('base')
 depends=('glibc' 'coreutils' 'util-linux')
+makedepends=('kernel26') #needed to build framebuffer blacklist
 install=udev.install
 backup=(etc/udev/udev.conf
         etc/scsi_id.config
@@ -19,15 +20,17 @@
 replaces=('devfsd')
 options=(!makeflags)
 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)
+        migrate-udev start_udev 51-arch.rules load-modules.sh
+        cdsymlinks.sh root-link.sh readme-udev-arch.txt arch-udev-rules.patch)
+md5sums=('502964d8623b81b6565c727dd28024de'
+         '49434a593918c822077bc3af765f1aff'
+         'a68a519d1ed8cbbd2f45c23eb32ea218'
+         '082e76ef9053495a5cade321817467cd'
+         '945f6d30ab458189b3c17f8e6722da1f'
+         '8424b78e9dd772e75b4ef90814807815'
+         '2d6dc6842464f107bccc68cd505a6c31'
+         '780db5316a762dc5cdcf52027ab8a8eb'
+         'c43a736b66edadadd9b91b8af1aa2d1c')
 
 build() {
   cd $startdir/src/$pkgname-$pkgver

Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch	2008-08-28 14:08:03 UTC (rev 10376)
+++ arch-udev-rules.patch	2008-08-28 15:38:35 UTC (rev 10377)
@@ -10,10 +10,13 @@
  # 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-07-24 09:55:12.000000000 -0500
-+++ 80-drivers.rules.arch	2008-08-27 21:10:32.000000000 -0500
-@@ -4,7 +4,7 @@
++++ 80-drivers.rules.arch	2008-08-28 00:46:39.000000000 -0500
+@@ -2,9 +2,9 @@
  
- DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
+ ACTION!="add", GOTO="drivers_end"
+ 
+-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
++DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $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)'"
 +   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'"