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

Tobias Powalowski tpowa at archlinux.org
Mon Dec 22 18:23:11 UTC 2008


    Date: Monday, December 22, 2008 @ 13:23:11
  Author: tpowa
Revision: 22185

upgpkg: udev 135-1

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

-----------------------+
 PKGBUILD              |    6 +++---
 arch-udev-rules.patch |   42 +++++++++++++++---------------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-22 17:49:17 UTC (rev 22184)
+++ PKGBUILD	2008-12-22 18:23:11 UTC (rev 22185)
@@ -3,7 +3,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
-pkgver=132
+pkgver=135
 pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
@@ -25,13 +25,13 @@
 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 readme-udev-arch.txt)
-md5sums=('0f51bffb4f5b86cb726b24a16c60a0aa'
+md5sums=('661b9df34e1304dad10f595d95b472bb'
          '3a955ca8e2122a48a223f9d8adf87b70'
          'f4951f61438d69894b728212dac7318b'
          'fca04a608009069beb786e26338a783b'
          '8424b78e9dd772e75b4ef90814807815'
          '2d6dc6842464f107bccc68cd505a6c31'
-         '122a5d2d56d2abd9dbe4544dffa17628'
+         'ae216c26a6a5cae4a3ef9c0e1f7bfaa6'
          '7fc6d33bb218e752302eef0a80ff0a89')
 
 build() {

Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch	2008-12-22 17:49:17 UTC (rev 22184)
+++ arch-udev-rules.patch	2008-12-22 18:23:11 UTC (rev 22185)
@@ -5,21 +5,19 @@
  SUBSYSTEM!="block", GOTO="persistent_storage_end"
  
  # skip rules for inappropriate block devices
--KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
-+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end"
+-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*|btibm*", GOTO="persistent_storage_end"
++KERNEL=="ram*|loop*|fd*|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"
 diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
 --- rules.d/80-drivers.rules	2008-09-12 15:59:57.000000000 +0200
 +++ rules.d.arch/80-drivers.rules	2008-09-12 16:01:56.000000000 +0200
-@@ -2,16 +2,17 @@
+@@ -2,14 +2,16 @@
  
  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=="mmc", RUN+="/sbin/modprobe mmc_block"
@@ -28,7 +26,6 @@
 -SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 -SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev"
 +DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
-+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+="/lib/udev/load-modules.sh tifm_sd"
 +SUBSYSTEM=="tifm", RUN+="/lib/udev/load-modules.sh tifm_ms"
 +SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
@@ -72,38 +69,29 @@
  
  # input
  KERNEL=="mouse*|mice|event*",	NAME="input/%k", MODE="0640"
-@@ -29,20 +35,25 @@
- 
- # video4linux
+@@ -36,13 +36,18 @@
+ KERNEL=="vtx*|vbi*",		GROUP="video"
+ KERNEL=="winradio*",		GROUP="video"
  KERNEL=="vbi0",			SYMLINK+="vbi"
-+KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="%k", GROUP="video"
- KERNEL=="radio0",		SYMLINK+="radio"
+-KERNEL=="radio0",		SYMLINK+="radio"
++KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", SYMLINK+="%k"
++KERNEL=="radio0",		SYMLINK+="video"
 +KERNEL=="radio[0-9]*", NAME="v4l/radio%n", SYMLINK+="radio%n", GROUP="video"
  KERNEL=="video0",		SYMLINK+="video"
-+KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k", GROUP="video"
++KERNEL=="video[0-9]*", NAME="v4l/video%n", SYMLINK+="%k"
 +KERNEL=="vtx0", SYMLINK+="vtx"
-+KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", SYMLINK+="%k", GROUP="video"
++KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", SYMLINK+="%k"
  
  # graphics
--KERNEL=="agpgart",		MODE="0600"
+-KERNEL=="agpgart",		MODE="0600", GROUP="video"
 -KERNEL=="card[0-9]*",		NAME="dri/%k", MODE="0666"
 -KERNEL=="fb0",			SYMLINK+="fb"
 +KERNEL=="agpgart", NAME="misc/%k", SYMLINK+="%k", GROUP="video", MODE="0600"
 +KERNEL=="card[0-9]*",		NAME="dri/%k", GROUP="video", MODE="0666"
 +KERNEL=="fb[0-9]*", NAME="fb/%n", SYMLINK+="%k", GROUP="video"
- 
- # DVB video
--SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
-+SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c", GROUP="video"
- 
- # Firewire
--KERNEL=="dv1394*",		SYMLINK+="dv1394/%n"
--KERNEL=="video1394*",		NAME="video1394/%n"
-+KERNEL=="dv1394*",		SYMLINK+="dv1394/%n", GROUP="video"
-+KERNEL=="video1394*",		NAME="video1394/%n", GROUP="video"
- 
- # firmware class requests
- SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
+ KERNEL=="pmu",			GROUP="video"
+ KERNEL=="nvidia*|nvidiactl*",	GROUP="video"
+ SUBSYSTEM=="graphics",		GROUP="video"
 @@ -62,19 +73,19 @@
  # block, tapes, block-releated
  SUBSYSTEM=="block", GROUP="disk"




More information about the arch-commits mailing list