[arch-commits] Commit in udev/repos (3 files)

Tobias Powalowski tpowa at archlinux.org
Mon Jan 25 01:37:09 EST 2010


    Date: Monday, January 25, 2010 @ 01:37:09
  Author: tpowa
Revision: 65218

Merged revisions 65211 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/udev/trunk

........
  r65211 | tpowa | 2010-01-25 06:34:28 +0000 (Mo, 25 Jan 2010) | 2 lines
  
  upgpkg: udev 150-3
      cleanup arch rules #17993
........

Modified:
  udev/repos/testing-i686/	(properties)
  udev/repos/testing-i686/81-arch.rules
  udev/repos/testing-i686/PKGBUILD

---------------+
 81-arch.rules |   14 +++-----------
 PKGBUILD      |    4 ++--
 2 files changed, 5 insertions(+), 13 deletions(-)


Property changes on: udev/repos/testing-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /udev/trunk:1-65171
   + /udev/trunk:1-65214

Modified: testing-i686/81-arch.rules
===================================================================
--- testing-i686/81-arch.rules	2010-01-25 06:36:39 UTC (rev 65217)
+++ testing-i686/81-arch.rules	2010-01-25 06:37:09 UTC (rev 65218)
@@ -1,8 +1,6 @@
 # Udev rules for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
 # do not edit this file, it will be overwritten on update
 #
-# This ruleset should provide a DevFS-compatible device tree.
-#
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
 #
@@ -36,8 +34,7 @@
 
 #PNP addon modules
 SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0510*", RUN+="/lib/udev/load-modules.sh irtty-sir"
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0511*", RUN+="/lib/udev/load-modules.sh irtty-sir"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir"
 SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
 
 # PARPORT addon modules
@@ -56,8 +53,8 @@
 ###### CD/DVD symlinks - begin
 #####################################
 ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode"
-ACTION=="add|change", SUBSYSTEMS=="scsi",	KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode"
-ACTION=="add|change", SUBSYSTEMS=="scsi",	KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode"
+ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode"
+ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode"
 ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b"
 ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b"
 ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b"
@@ -127,7 +124,6 @@
 KERNEL=="fb[0-9]*",	GROUP="video"
 
 # misc
-KERNEL=="uinput",	SYMLINK+="%k"
 KERNEL=="sgi_fetchop",	MODE="0666"
 KERNEL=="sonypi",	MODE="0666"
 
@@ -140,10 +136,6 @@
 # kbd devices
 KERNEL=="kbd", MODE="0664"
 
-# CPU
-KERNEL=="cpu[0-9]*", SYMLINK="%k"
-KERNEL=="msr[0-9]*", SYMLINK="%k"
-
 # miscellaneous
 KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664"
 #######################################

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2010-01-25 06:36:39 UTC (rev 65217)
+++ testing-i686/PKGBUILD	2010-01-25 06:37:09 UTC (rev 65218)
@@ -6,7 +6,7 @@
 pkgbase="udev"
 pkgname=('udev' 'udev-compat')
 pkgver=150
-pkgrel=2
+pkgrel=3
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
 license=('GPL')
@@ -18,7 +18,7 @@
         81-arch.rules load-modules.sh cdsymlinks.sh root-link.sh
         arch-udev-rules.patch ignore-remove.sh)
 md5sums=('4ad5ada5f5cefb2517996825c1d2a7d6'
-         'cc6406e8b67b2b8711942098a66cde6b'
+         '6393ee81993f8b9beb776ca904005864'
          'a2d0d59742b80b3b28ed498718654eb7'
          '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'



More information about the arch-commits mailing list