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

[Tobias Powalowski]

    Date: Thursday, April 9, 2009 @ 05:30:03
  Author: tpowa
Revision: 34396

upgpkg: udev 141-1

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

-----------------------+
 PKGBUILD              |   15 ++++++---------
 arch-udev-rules.patch |    6 +++---
 2 files changed, 9 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-04-09 08:31:24 UTC (rev 34395)
+++ PKGBUILD	2009-04-09 09:30:03 UTC (rev 34396)
@@ -3,8 +3,8 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
-pkgver=140
-pkgrel=2
+pkgver=141
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -24,21 +24,18 @@
 options=(!makeflags)
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
         81-arch.rules load-modules.sh resolve-modalias.c cdsymlinks.sh root-link.sh
-        arch-udev-rules.patch ignore-remove.sh udev-140-default.patch)
-md5sums=('7d1e5737a3557849eecd701a7fb068b4'
+        arch-udev-rules.patch ignore-remove.sh)
+md5sums=('1670fe81cabf5161319c52084cf81134'
          '4a7007a8e4102858fa7b9012c96038bf'
          'f4951f61438d69894b728212dac7318b'
          'e0d7ab73ec42eb81947daf23e224c0fb'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
-         'b99537347a0b33815d64c97bd6f954ee'
-         '35fa97500243a79b2370fa4684828e69'
-         'f95ecb28df83d14d3d0ec7fa0c60f53f')
+         '03a82da74c5724d4a80a24a12e218abc'
+         '35fa97500243a79b2370fa4684828e69')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  # patch default rules files, remove with 141 release!
-  patch -Np1 -i ../udev-140-default.patch || return 1 
   ./configure --prefix="" --mandir=/usr/share/man --includedir=/usr/include
   make || return 1
   make DESTDIR=$startdir/pkg install

Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch	2009-04-09 08:31:24 UTC (rev 34395)
+++ arch-udev-rules.patch	2009-04-09 09:30:03 UTC (rev 34396)
@@ -46,11 +46,11 @@
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
  
  # skip rules for inappropriate block devices
--KERNEL=="ram*|fd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
-+KERNEL=="ram*|fd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
+-KERNEL=="fd*|mtd*|nbd*|gnbd*|btibm*|dm-*|md*", GOTO="persistent_storage_end"
++KERNEL=="fd*|mtd*|nbd*|gnbd*|md*|btibm*", GOTO="persistent_storage_end"
  
  # 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"
+ KERNEL=="hd*[!0-9]", ATTR{removable}=="1", SUBSYSTEMS=="ide", ATTRS{media}=="disk|floppy", GOTO="persistent_storage_end"
 diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
 --- rules.d/80-drivers.rules	2009-03-07 22:22:48.200242883 +0100
 +++ rules.d.arch/80-drivers.rules	2009-03-07 22:22:54.757744454 +0100