[arch-commits] CVS update of core/base/klibc-udev (PKGBUILD udev.rules)
Tobias Powalowski
tpowa at archlinux.org
Sun Mar 9 22:19:48 UTC 2008
Date: Sunday, March 9, 2008 @ 18:19:48
Author: tpowa
Path: /home/cvs-core/core/base/klibc-udev
Modified: PKGBUILD (1.36 -> 1.37) udev.rules (1.20 -> 1.21)
'only added new rules and prepare for 118 version, note udevadm is still broken with klibc :('
------------+
PKGBUILD | 21 ++++++++-------------
udev.rules | 30 ++++++++++++++++++------------
2 files changed, 26 insertions(+), 25 deletions(-)
Index: core/base/klibc-udev/PKGBUILD
diff -u core/base/klibc-udev/PKGBUILD:1.36 core/base/klibc-udev/PKGBUILD:1.37
--- core/base/klibc-udev/PKGBUILD:1.36 Thu Feb 28 13:30:56 2008
+++ core/base/klibc-udev/PKGBUILD Sun Mar 9 18:19:48 2008
@@ -1,25 +1,19 @@
-# $Id: PKGBUILD,v 1.36 2008/02/28 18:30:56 thomas Exp $
+# $Id: PKGBUILD,v 1.37 2008/03/09 22:19:48 tpowa Exp $
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=klibc-udev
-pkgver=116
-pkgrel=3
+pkgver=118
+pkgrel=1
pkgdesc="udevd compiled under klibc"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
groups=('base')
-depends=('coreutils' 'klibc>=1.5-4')
+depends=('coreutils' 'klibc>=1.5-5')
license=('GPL')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2 \
udev_hook udev_install start_udev udev.rules load-modules.sh \
vol_id-suspend2.patch)
-md5sums=('02c49d93ffda4a104c853c082138b835'
- 'bcfed63882660e7d33f367d722e0a5c9'
- '44747726599e90a2fa3db474bfc57a0e'
- '22741baf8f5d7d8bc88022b39bca74d8'
- '84797123003a7e6079aee9ac3291881a'
- '1ecfeec15e88485e88f2e37f46861f2e'
- '80f75fc9a8fc32c7b8ff146d53bf579f')
+options=(!makeflags)
build()
{
@@ -28,7 +22,7 @@
sed -i "s|USE_LOG = .*|USE_LOG = false|g" Makefile
#I need to look at this... it appears the __CTYPE_NO_INLINE may be a klibc issue - aaron
- make VOLUME_ID_STATIC=true CC=klcc LD=klcc PROGRAMS="udevd udevsettle udevtrigger" \
+ make VOLUME_ID_STATIC=true CC=klcc LD=klcc PROGRAMS="udevd udevtrigger udevsettle" \
CFLAGS="$CFLAGS -U__CTYPE_NO_INLINE" \
EXTRAS="extras/firmware extras/cdrom_id extras/ata_id \
extras/edd_id extras/scsi_id extras/usb_id extras/volume_id" \
@@ -50,9 +44,10 @@
install -m755 $startdir/src/start_udev $startdir/pkg/lib/initcpio/udev
install -m644 $startdir/src/udev.rules $startdir/pkg/lib/initcpio/udev
install -m755 $startdir/src/load-modules.sh $startdir/pkg/lib/initcpio/udev
+
mkdir -p $startdir/pkg/lib/initcpio/install
install -m644 $startdir/src/udev_install $startdir/pkg/lib/initcpio/install/udev
mkdir -p $startdir/pkg/lib/initcpio/hooks/
- install -m644 $startdir/src/udev_hook $startdir/pkg/lib/initcpio/hooks/udev
+ install -m644 $startdir/src/udev_hook $startdir/pkg/lib/initcpio/hooks/udev
}
Index: core/base/klibc-udev/udev.rules
diff -u core/base/klibc-udev/udev.rules:1.20 core/base/klibc-udev/udev.rules:1.21
--- core/base/klibc-udev/udev.rules:1.20 Mon Oct 15 13:55:56 2007
+++ core/base/klibc-udev/udev.rules Sun Mar 9 18:19:48 2008
@@ -36,20 +36,26 @@
#####################################
###### Hotplug rules - begin
#####################################
-
-# Modaliases to load
-ACTION=="add", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
+# check if the device has already been claimed by a driver
+ACTION!="add", GOTO="drivers_end"
+# load modalias
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
# SCSI addon modules
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[23689]", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
-ACTION=="add", SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block"
+SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sr_mod"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
+SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
+SUBSYSTEM=="scsi", ATTRS{type}=="[23689]", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block"
+SUBSYSTEM=="tifm", RUN+="/lib/udev/load-modules.sh --all tifm_sd tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh --all ms_block mspro_block"
+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block"
+SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/lib/udev/load-modules.sh ide-scsi"
+SUBSYSTEM=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
-LABEL="hotplug_driver_loaded"
+LABEL="drivers_end"
# FIRMWARE
ACTION=="add", SUBSYSTEM=="firmware", ENV{FIRMWARE}=="?*", RUN+="/lib/udev/firmware.sh"
More information about the arch-commits
mailing list