[arch-commits] Commit in udev/trunk (81-arch.rules PKGBUILD cdsymlinks.sh)

Tobias Powalowski tpowa at archlinux.org
Sat Mar 28 12:07:19 UTC 2009 

    Date: Saturday, March 28, 2009 @ 08:07:19
  Author: tpowa
Revision: 31755

upgpkg: udev 140-2

Modified:
  udev/trunk/81-arch.rules
  udev/trunk/PKGBUILD
  udev/trunk/cdsymlinks.sh

---------------+
 81-arch.rules |   12 ++++++------
 PKGBUILD      |   29 +++++++++++++++--------------
 cdsymlinks.sh |    2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

Modified: 81-arch.rules
===================================================================
--- 81-arch.rules	2009-03-28 09:21:06 UTC (rev 31754)
+++ 81-arch.rules	2009-03-28 12:07:19 UTC (rev 31755)
@@ -55,16 +55,16 @@
 #####################################
 ###### CD/DVD symlinks - begin
 #####################################
-ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode"
-ACTION=="add", SUBSYSTEMS=="scsi",	KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode"
-ACTION=="add", SUBSYSTEMS=="scsi",	KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode"
+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"
 ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b"
 ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b"
 ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b"
 ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b"
-ACTION=="add", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh"
-ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
-ACTION=="add", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
+ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh"
+ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
+ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh"
 ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh"
 ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh"
 ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh"

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-03-28 09:21:06 UTC (rev 31754)
+++ PKGBUILD	2009-03-28 12:07:19 UTC (rev 31755)
@@ -24,19 +24,21 @@
 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 readme-udev-arch.txt ignore-remove.sh)
+        arch-udev-rules.patch ignore-remove.sh udev-140-default.patch)
 md5sums=('7d1e5737a3557849eecd701a7fb068b4'
-         '825b2a4c7a7d781cc4d78f7d00e91617'
+         '4a7007a8e4102858fa7b9012c96038bf'
          'f4951f61438d69894b728212dac7318b'
          'e0d7ab73ec42eb81947daf23e224c0fb'
-         'c090a2d58c4b9a227ad2f0675c6b54c1'
+         '2e808ee78d237c478b57af2a68d43769'
          '2d6dc6842464f107bccc68cd505a6c31'
          'b99537347a0b33815d64c97bd6f954ee'
-         'fabe285ca75122bd0f2033f13869989d'
-         '35fa97500243a79b2370fa4684828e69')
+         '35fa97500243a79b2370fa4684828e69'
+         'f95ecb28df83d14d3d0ec7fa0c60f53f')
 
 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
@@ -57,27 +59,27 @@
   install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.sh
   # install ignore-remove.sh
   install -D -m755 $srcdir/ignore-remove.sh $pkgdir/lib/udev/ignore-remove.sh
-
-  # install instructions
-  # NOTE: We should delete this file
-  install -D -m644 $srcdir/readme-udev-arch.txt $pkgdir/usr/share/udev/readme-udev-arch.txt
-
   # disable error logging to prevent startup failures printed to vc on boot
   sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf
-  # install additional rules files
+
+  # install additional standard rules files
   for rule in $srcdir/$pkgname-$pkgver/rules/packages/*.rules; do
       install -D -m 644 $rule $pkgdir/lib/udev/rules.d/
   done
   # fix standard udev rules to fit to arch
   cd $pkgdir/lib/udev/rules.d/
   patch -Np1 -i $srcdir/arch-udev-rules.patch || return 1
-
   # disable persistent cdromsymlinks and network by default 
   # and move it to /etc/udev/rules.d
   mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \
      $pkgdir/etc/udev/rules.d/75-persistent-net-generator.rules.optional
   mv $pkgdir/lib/udev/rules.d/75-cd-aliases-generator.rules \
      $pkgdir/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
+  # remove not needed rules
+  rm $pkgdir/lib/udev/rules.d/40-ia64.rules
+  rm $pkgdir/lib/udev/rules.d/40-ppc.rules
+  rm $pkgdir/lib/udev/rules.d/40-s390.rules
+
   # create framebuffer blacklist
   mkdir -p $pkgdir/etc/modprobe.d/
   for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko' -exec basename {} .ko \;); do 
@@ -95,12 +97,11 @@
   mknod -m 0666 ${pkgdir}/lib/udev/devices/kmsg c 1 11 || return 1
 
   ln -snf /proc/self/fd ${pkgdir}/lib/udev/devices/fd || return 1
-
   ln -snf /proc/self/fd/0 ${pkgdir}/lib/udev/devices/stdin || return 1
   ln -snf /proc/self/fd/1 ${pkgdir}/lib/udev/devices/stdout || return 1
   ln -snf /proc/self/fd/2 ${pkgdir}/lib/udev/devices/stderr || return 1
+  ln -snf /proc/kcore ${pkgdir}/lib/udev/devices/core || return 1
 
-  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

Modified: cdsymlinks.sh
===================================================================
--- cdsymlinks.sh	2009-03-28 09:21:06 UTC (rev 31754)
+++ cdsymlinks.sh	2009-03-28 12:07:19 UTC (rev 31755)
@@ -3,7 +3,7 @@
 # for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
 
 # check on cd/dvd drives and if persistant rules file is used
-if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-cd-aliases-generator.rules ]; then
+if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then
 	# remove existing device files
 	rm /dev/cdrom*
 	rm /dev/cdrw*

More information about the arch-commits mailing list