[arch-commits] CVS update of arch/build/base/udev (PKGBUILD udev.rules)

Tobias Powalowski tpowa at archlinux.org
Sat Apr 28 06:43:58 EDT 2007


    Date: Saturday, April 28, 2007 @ 06:43:58
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/udev

Modified: PKGBUILD (1.132 -> 1.133) udev.rules (1.81 -> 1.82)

'upgpkg: update to new version'


------------+
 PKGBUILD   |   23 +++++++++--------------
 udev.rules |   15 +++++++++++----
 2 files changed, 20 insertions(+), 18 deletions(-)


Index: arch/build/base/udev/PKGBUILD
diff -u arch/build/base/udev/PKGBUILD:1.132 arch/build/base/udev/PKGBUILD:1.133
--- arch/build/base/udev/PKGBUILD:1.132	Mon Mar 26 14:00:49 2007
+++ arch/build/base/udev/PKGBUILD	Sat Apr 28 06:43:58 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.132 2007/03/26 18:00:49 tpowa Exp $
+# $Id: PKGBUILD,v 1.133 2007/04/28 10:43:58 tpowa Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=udev
-pkgver=107
-pkgrel=3
+pkgver=109
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -14,20 +14,19 @@
 replaces=('devfsd')
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 \
         migrate-udev udev.rules start_udev load-modules.sh cdrom-rules.patch cdsymlinks.sh root-link.sh\
-	readme-udev-arch.txt post-107.patch)
-md5sums=('b90dcb9d6d164fa34fe6632c506ce867' '49434a593918c822077bc3af765f1aff'\
-         'ccc2a8eb258d184884df2a04b6f2ba85' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
+	readme-udev-arch.txt)
+md5sums=('6fd1ed31f48d7e99c549a132974a34c0' '49434a593918c822077bc3af765f1aff'\
+         '05d39c53ab4f48793da24cf8c82fbb27' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
          '592f2ba6323b66799f4954f1ed1ee93b' '12d3ab1283c56beb903afcab11789037'\
          '8424b78e9dd772e75b4ef90814807815' '2d6dc6842464f107bccc68cd505a6c31'\
-	 'f01c60661e4b32ca7c7f905c1e194a52' 'd3b6ac926fb7b3c34d202c1deafd9f1d')
+         'f01c60661e4b32ca7c7f905c1e194a52')
 
 build() {
   export MAKEFLAGS="$MAKEFLAGS -j1"
   cd $startdir/src/$pkgname-$pkgver
-  patch -Np1 -i ../post-107.patch || return 1
   make || return 1
   make INSTALL=/bin/install DESTDIR=$startdir/pkg install \
-    EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id extras/firmware extras/floppy  extras/run_directory extras/scsi_id extras/usb_id extras/volume_id extras/path_id extras/rule_generator"
+    EXTRAS="extras/ata_id extras/cdrom_id extras/edd_id extras/firmware extras/floppy extras/scsi_id extras/usb_id extras/volume_id extras/path_id extras/rule_generator"
   # rmdir $startdir/pkg/udev
   rm -f $startdir/pkg/etc/udev/rules.d/50-udev.rules
   rm -f $startdir/pkg/etc/udev/permissions.d/50-udev.permissions || return 1
@@ -57,8 +56,4 @@
   mv $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules \
      $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
 }
-md5sums=('b90dcb9d6d164fa34fe6632c506ce867' '49434a593918c822077bc3af765f1aff'\
-         'ccc2a8eb258d184884df2a04b6f2ba85' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
-         '592f2ba6323b66799f4954f1ed1ee93b' '12d3ab1283c56beb903afcab11789037'\
-         '8424b78e9dd772e75b4ef90814807815' '2d6dc6842464f107bccc68cd505a6c31'\
-         'f01c60661e4b32ca7c7f905c1e194a52' 'd3b6ac926fb7b3c34d202c1deafd9f1d')
+
Index: arch/build/base/udev/udev.rules
diff -u arch/build/base/udev/udev.rules:1.81 arch/build/base/udev/udev.rules:1.82
--- arch/build/base/udev/udev.rules:1.81	Sun Mar 25 09:38:00 2007
+++ arch/build/base/udev/udev.rules	Sat Apr 28 06:43:58 2007
@@ -69,7 +69,8 @@
 
 #PNP addon modules
 ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
-ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0b00", RUN+="/lib/udev/load-modules.sh rtc"
+# not needed anymore with kernel >= 2.6.21
+#ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0b00", RUN+="/lib/udev/load-modules.sh rtc"
 ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0510*", RUN+="/lib/udev/load-modules.sh irtty-sir"
 ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0511*", RUN+="/lib/udev/load-modules.sh irtty-sir"
 ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
@@ -348,6 +349,11 @@
 KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}"
 KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
 
+# libata compat (links like hd*)
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}"
+KERNEL=="sd*[0-9]", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}-part%n"
+
 KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}"
 KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
 
@@ -394,15 +400,16 @@
 ATTRS{name}=="*dvb*|*DVB*|* IR *",      ENV{ID_CLASS}="ir"
 ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", ENV{ID_CLASS}="joystick"
 
-ENV{ID_SERIAL}=="",                     ENV{ID_SERIAL}="noserial"
+# fill empty serial number
++ENV{ID_CLASS}=="?*", ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noserial"
 
 # by-id links, generic and for the event devices
-KERNEL=="mouse*", ENV{ID_SUBSYSTEMS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-$env{ID_CLASS}"
+KERNEL=="mouse*|js*", ENV{ID_SUBSYSTEMS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-$env{ID_CLASS}"
 KERNEL=="event*", ENV{ID_SUBSYSTEMS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-event-$env{ID_CLASS}"
  
 # by-path links
 IMPORT{program}="/lib/udev/path_id %p"
-KERNEL=="mouse*", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
+KERNEL=="mouse*|js*", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
 KERNEL=="event*", ENV{ID_PATH}=="?*", SYMLINK+="input/by-path/$env{ID_PATH}-event-$env{ID_CLASS}" 
 
 LABEL="persistent_input_end"




More information about the arch-commits mailing list