[arch-commits] Commit in udev/trunk (80-drivers.rules PKGBUILD arch-udev-rules.patch)
Tobias Powalowski
tpowa at archlinux.org
Sun Aug 29 11:34:57 UTC 2010
Date: Sunday, August 29, 2010 @ 07:34:56
Author: tpowa
Revision: 89102
upgpkg: udev 161-2
fix #20107
Added:
udev/trunk/80-drivers.rules
Modified:
udev/trunk/PKGBUILD
udev/trunk/arch-udev-rules.patch
-----------------------+
80-drivers.rules | 14 +++++++++++++
PKGBUILD | 25 ++++++++++++------------
arch-udev-rules.patch | 50 ------------------------------------------------
3 files changed, 27 insertions(+), 62 deletions(-)
Added: 80-drivers.rules
===================================================================
--- 80-drivers.rules (rev 0)
+++ 80-drivers.rules 2010-08-29 11:34:56 UTC (rev 89102)
@@ -0,0 +1,14 @@
+# do not edit this file, it will be overwritten on update
+
+ACTION=="remove", GOTO="drivers_end"
+
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
+
+LABEL="drivers_end"
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-29 11:15:55 UTC (rev 89101)
+++ PKGBUILD 2010-08-29 11:34:56 UTC (rev 89102)
@@ -6,7 +6,7 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
pkgver=161
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
@@ -15,13 +15,15 @@
options=(!makeflags !libtool)
makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
- 81-arch.rules load-modules.sh cdsymlinks.sh
- arch-udev-rules.patch)
+ 80-drivers.rules
+ 81-arch.rules
+ load-modules.sh
+ cdsymlinks.sh)
md5sums=('95b6a0ffc9913f3e8021c65f51eb4f88'
+ '4427855146513a4703ab5c7eb8a0156e'
'f17c99779173ddc79f866cf3a5de5e68'
'f91fddc67609b45b244a624977c4247b'
- '2e808ee78d237c478b57af2a68d43769'
- '70198227b7bbe3852e1cd2299693af66')
+ '2e808ee78d237c478b57af2a68d43769')
build() {
cd $srcdir/$pkgname-$pkgver
@@ -49,6 +51,8 @@
mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib
# Fix ConsoleKit path
mv $pkgdir/lib/ConsoleKit $pkgdir/usr/lib
+ # Replace original 80-drivers.rules with custom one.
+ install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules
# Install our rule for permissions and symlinks
install -D -m644 $srcdir/81-arch.rules $pkgdir/lib/udev/rules.d/81-arch.rules
# install our module loading subsystem
@@ -57,11 +61,6 @@
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
# 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
- # fix standard udev rules to fit to arch
- cd $pkgdir/lib/udev/rules.d/
- patch -Np1 -i $srcdir/arch-udev-rules.patch
- # remove .orig files
- rm -f $pkgdir/lib/udev/rules.d/*.orig
# 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 \
@@ -102,9 +101,11 @@
# /dev/ppp
mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
- # Replace dialout group in rules with uucp group
+ # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group
for i in $pkgdir/lib/udev/rules.d/*.rules; do
- sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g' $i
+ sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g;
+ s#GROUP="tape"#GROUP="storage"#g;
+ s#GROUP="cdrom"#GROUP="optical"#g' $i
done
mv "${pkgdir}/lib/girepository-1.0" "${pkgdir}/usr/lib/"
Modified: arch-udev-rules.patch
===================================================================
--- arch-udev-rules.patch 2010-08-29 11:15:55 UTC (rev 89101)
+++ arch-udev-rules.patch 2010-08-29 11:34:56 UTC (rev 89102)
@@ -1,50 +0,0 @@
-diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules
---- rules.d/50-udev-default.rules 2009-03-07 22:22:48.200242883 +0100
-+++ rules.d.arch/50-udev-default.rules 2009-03-07 22:23:26.134434516 +0100
-@@ -59,15 +59,15 @@
- KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k"
-
- # cdrom
--SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom"
--SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom"
--KERNEL=="pktcdvd[0-9]*", GROUP="cdrom"
--KERNEL=="pktcdvd", GROUP="cdrom"
-+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660"
-+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660"
-+KERNEL=="pktcdvd[0-9]*", GROUP="optical", MODE="0660"
-+KERNEL=="pktcdvd", GROUP="optical", MODE="0660"
-
- # tape
--KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
--KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
--SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
-+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660"
-+KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660"
-+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660"
-
- # block-related
- KERNEL=="sch[0-9]*", GROUP="disk"
-diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules
---- rules.d/80-drivers.rules 2010-06-03 11:55:08.978720002 +0200
-+++ rules.d.arch/80-drivers.rules 2010-06-03 11:58:41.207865142 +0200
-@@ -2,12 +2,13 @@
-
- ACTION=="remove", GOTO="drivers_end"
-
--DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -bv $env{MODALIAS}"
--SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -bv tifm_sd"
--SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -bv tifm_ms"
--SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -bv --all ms_block mspro_block"
--SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block"
--SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -bv sg"
--SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev"
-+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
-+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd"
-+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms"
-+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block"
-+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block"
-+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
-+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
-+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev"
-
- LABEL="drivers_end"
More information about the arch-commits
mailing list