[arch-commits] Commit in udev/repos/core-i686 (81-arch.rules PKGBUILD)

Allan McRae allan at archlinux.org
Mon Aug 3 08:52:59 UTC 2009


    Date: Monday, August 3, 2009 @ 04:52:59
  Author: allan
Revision: 48736

moving to core

Modified:
  udev/repos/core-i686/81-arch.rules
  udev/repos/core-i686/PKGBUILD

---------------+
 81-arch.rules |   76 ++++++--------------------------------------------------
 PKGBUILD      |   16 ++++-------
 2 files changed, 15 insertions(+), 77 deletions(-)

Modified: 81-arch.rules
===================================================================
--- 81-arch.rules	2009-08-03 08:52:43 UTC (rev 48735)
+++ 81-arch.rules	2009-08-03 08:52:59 UTC (rev 48736)
@@ -109,91 +109,33 @@
 # permissions for SCSI scanners
 SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner"
 
-# consoles
-KERNEL=="tty[0-9]*",	NAME="vc/%n", SYMLINK+="%k"
-KERNEL=="vcs",        	NAME="vcc/0"
-KERNEL=="vcs[0-9]*",	NAME="vcc/%n"
-KERNEL=="vcsa",		NAME="vcc/a0"
-KERNEL=="vcsa[0-9]*"	NAME="vcc/a%n"
-
-# serial
-KERNEL=="ttyS[0-9]*",   NAME="tts/%n", SYMLINK+="ttyS%n"
-KERNEL=="ttyUSB[0-9]*", NAME="tts/USB%n", SYMLINK+="%k"
-
-# md block devices
-KERNEL=="md[0-9]*", NAME="md%n", SYMLINK+="md/%n"
-
 # mem
 KERNEL=="ram0", SYMLINK+="ramdisk"
 KERNEL=="ram1", SYMLINK+="ram"
-KERNEL=="ram[0-9]*", NAME="rd/%n", SYMLINK+="%k"
 
 # video4linux
-KERNEL=="vbi0",					SYMLINK+="vbi"
-KERNEL=="vbi[0-9]*",   NAME="v4l/vbi%n", 	SYMLINK+="%k"
-KERNEL=="radio0",				SYMLINK+="radio"
-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"
-KERNEL=="vtx0", 				SYMLINK+="vtx"
-KERNEL=="vtx[0-9]*",   NAME="v4l/vtx%n", 	SYMLINK+="%k"
 
+KERNEL=="vbi0",		SYMLINK+="vbi"
+KERNEL=="radio0",	SYMLINK+="radio"
+KERNEL=="radio[0-9]*",	GROUP="video"
+KERNEL=="video0",	SYMLINK+="video"
+KERNEL=="vtx0",		SYMLINK+="vtx"
+
 # video devices
 ### xorg resets those permissions, adjust your xorg.conf!
 KERNEL=="3dfx*",	GROUP="video"
-KERNEL=="agpgart", 	NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="fb[0-9]*", 	NAME="fb/%n", 	SYMLINK+="%k", GROUP="video"
+KERNEL=="fb[0-9]*",	GROUP="video"
 
-# i2c devices
-KERNEL=="i2c-[0-9]*", NAME="i2c/%n", SYMLINK+="%k"
-
-# loop devices
-KERNEL=="loop[0-9]*", NAME="loop/%n", SYMLINK+="%k"
-
 # misc
-KERNEL=="nvram",	NAME="misc/%k", SYMLINK+="%k"
-KERNEL=="psaux",	NAME="misc/%k", SYMLINK+="%k"
 KERNEL=="uinput",	SYMLINK+="%k"
 KERNEL=="sgi_fetchop",	MODE="0666"
 KERNEL=="sonypi",	MODE="0666"
-KERNEL=="inotify",	NAME="misc/%k",	SYMLINK+="%k", MODE="0666"
 
-# sound devices
-# oss devices
-KERNEL=="audio*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="dmmidi*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="admmidi*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="dsp*",		NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="adsp*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="amidi*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="mixer*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="sequencer*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="aload*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="amixer*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="music",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="dmfm*",	NAME="sound/%k", SYMLINK+="%k"
-KERNEL=="midi[0-9]*",	NAME="sound/%k", SYMLINK+="%k"
-
 # USB devices
 KERNEL=="legousbtower*", MODE="0666"
 
-# netlink devices
-KERNEL=="route",	NAME="netlink/%k"
-KERNEL=="skip",		NAME="netlink/%k"
-KERNEL=="usersock",	NAME="netlink/%k"
-KERNEL=="fwmonitor",	NAME="netlink/%k"
-KERNEL=="tcpdiag",	NAME="netlink/%k"
-KERNEL=="nflog",	NAME="netlink/%k"
-KERNEL=="xfrm",		NAME="netlink/%k"
-KERNEL=="arpd",		NAME="netlink/%k"
-KERNEL=="route6",	NAME="netlink/%k"
-KERNEL=="ip6_fw",	NAME="netlink/%k"
-KERNEL=="dnrtmsg",	NAME="netlink/%k"
-### ! disabled seems to break device creation !
-# KERNEL=="tap*",	NAME="netlink/%k"
-
 # IEEE1394 (firewire) devices
-KERNEL=="raw1394", NAME="%k", GROUP="video"
+KERNEL=="raw1394",	GROUP="video"
 
 # kbd devices
 KERNEL=="kbd", MODE="0664"
@@ -203,7 +145,7 @@
 KERNEL=="msr[0-9]*", SYMLINK="%k"
 
 # miscellaneous
-KERNEL=="rtc|rtc0", NAME="misc/%k", SYMLINK+="%k", GROUP="audio", MODE="0664"
+KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664"
 #######################################
 # Permissions and Symlinks - end
 #######################################

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-08-03 08:52:43 UTC (rev 48735)
+++ PKGBUILD	2009-08-03 08:52:59 UTC (rev 48736)
@@ -4,7 +4,7 @@
 # Maintainer: Thomas Bächler <thomas at archlinux.org>
 pkgname=udev
 pkgver=141
-pkgrel=3
+pkgrel=5
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -20,13 +20,13 @@
 conflicts=('pcmcia-cs' 'hotplug')
 replaces=('devfsd')
 # older initscripts versions required start_udev
-conflicts=('initscripts<2008.02')
+conflicts=('initscripts<2009.07')
 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)
 md5sums=('1670fe81cabf5161319c52084cf81134'
-         '4a7007a8e4102858fa7b9012c96038bf'
+         'cc6406e8b67b2b8711942098a66cde6b'
          'f4951f61438d69894b728212dac7318b'
          '64a0169dc9d883a63ff9f8f491fdc34a'
          '2e808ee78d237c478b57af2a68d43769'
@@ -100,13 +100,9 @@
   ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core || return 1
 
   # these static devices are created for convenience, to autoload the modules if necessary
-  # /dev/loopX, /dev/loop/X
-  mkdir ${pkgdir}/lib/udev/devices/loop
-  for i in $(seq 0 7); do
-    mknod -m 0660 ${pkgdir}/lib/udev/devices/loop/$i b 7 $i || return 1
-    chgrp disk ${pkgdir}/lib/udev/devices/loop/$i || return 1
-    ln -snf loop/$i ${pkgdir}/lib/udev/devices/loop$i || return 1
-  done
+  # /dev/loop0
+  mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0 || return 1
+  chgrp disk ${pkgdir}/lib/udev/devices/loop0 || return 1
   # /dev/net/tun
   mkdir ${pkgdir}/lib/udev/devices/net
   mknod -m 0666 ${pkgdir}/lib/udev/devices/net/tun c 10 200 || return 1




More information about the arch-commits mailing list