summaryrefslogtreecommitdiffstats
path: root/abs
diff options
context:
space:
mode:
Diffstat (limited to 'abs')
-rw-r--r--abs/core/udev/80-drivers.rules14
-rw-r--r--abs/core/udev/81-arch.rules5
-rw-r--r--abs/core/udev/PKGBUILD40
-rw-r--r--abs/core/udev/udev.install15
4 files changed, 43 insertions, 31 deletions
diff --git a/abs/core/udev/80-drivers.rules b/abs/core/udev/80-drivers.rules
new file mode 100644
index 0000000..56ac06c
--- /dev/null
+++ b/abs/core/udev/80-drivers.rules
@@ -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"
diff --git a/abs/core/udev/81-arch.rules b/abs/core/udev/81-arch.rules
index 40e0a7c..21127a7 100644
--- a/abs/core/udev/81-arch.rules
+++ b/abs/core/udev/81-arch.rules
@@ -73,8 +73,6 @@ ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh"
# Additional Archlinux
# Permissions and Symlinks - begin
#####################################
-# fix /dev/root symlink
-SUBSYSTEM=="block", RUN+="root-link.sh"
# permission for sg devices
KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
@@ -130,9 +128,6 @@ KERNEL=="sonypi", MODE="0666"
# USB devices
KERNEL=="legousbtower*", MODE="0666"
-# IEEE1394 (firewire) devices
-KERNEL=="raw1394", GROUP="video"
-
# kbd devices
KERNEL=="kbd", MODE="0664"
diff --git a/abs/core/udev/PKGBUILD b/abs/core/udev/PKGBUILD
index 2f71d28..c7ad8b3 100644
--- a/abs/core/udev/PKGBUILD
+++ b/abs/core/udev/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 85315 2010-07-12 05:13:37Z tpowa $
+# $Id: PKGBUILD 94655 2010-10-09 09:42:22Z tpowa $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
pkgbase="udev"
pkgname=('udev' 'udev-compat')
-pkgver=160
+pkgver=163
pkgrel=1
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
groups=('base')
@@ -15,21 +15,18 @@ groups=('base')
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 root-link.sh
- arch-udev-rules.patch
- logitech-rules.patch)
-md5sums=('65459a1f090082c0471bf4e5112208d7'
- '6393ee81993f8b9beb776ca904005864'
+ 80-drivers.rules
+ 81-arch.rules
+ load-modules.sh
+ cdsymlinks.sh)
+md5sums=('8b584982c5548ca0368beeddc5413146'
+ '4427855146513a4703ab5c7eb8a0156e'
+ 'f17c99779173ddc79f866cf3a5de5e68'
'f91fddc67609b45b244a624977c4247b'
- '2e808ee78d237c478b57af2a68d43769'
- '2d6dc6842464f107bccc68cd505a6c31'
- '70198227b7bbe3852e1cd2299693af66'
- '817537bdcfc1a4fa79e853fd38df4528')
+ '2e808ee78d237c478b57af2a68d43769')
build() {
cd $srcdir/$pkgname-$pkgver
- # fix logitech rules
- patch -Np0 -i $srcdir/logitech-rules.patch
./configure --prefix="" --mandir=/usr/share/man\
--includedir=/usr/include\
--libexecdir=/lib/udev\
@@ -54,21 +51,16 @@ package_udev() {
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
install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh
# install cdsymlinks.sh
install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh
- # install root-link.sh
- install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.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 \
@@ -109,9 +101,11 @@ package_udev() {
# /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/"
diff --git a/abs/core/udev/udev.install b/abs/core/udev/udev.install
index b4ce3c8..2c92add 100644
--- a/abs/core/udev/udev.install
+++ b/abs/core/udev/udev.install
@@ -19,9 +19,18 @@ post_install() {
ROOTDIR=""
[ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX)
[ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR}
- [ -c ${ROOTDIR}/dev/console ] || mknod -m600 ${ROOTDIR}/dev/console c 5 1
- [ -c ${ROOTDIR}/dev/null ] || mknod -m644 ${ROOTDIR}/dev/null c 1 3
- [ -c ${ROOTDIR}/dev/zero ] || mknod -m644 ${ROOTDIR}/dev/zero c 1 5
+ if [ ! -c ${ROOTDIR}/dev/console ]; then
+ rm -f ${ROOTDIR}/dev/console
+ mknod -m600 ${ROOTDIR}/dev/console c 5 1
+ fi
+ if [ ! -c ${ROOTDIR}/dev/null ]; then
+ rm -f ${ROOTDIR}/dev/null
+ mknod -m644 ${ROOTDIR}/dev/null c 1 3
+ fi
+ if [ ! -c ${ROOTDIR}/dev/zero ]; then
+ rm ${ROOTDIR}/dev/zero
+ mknod -m644 ${ROOTDIR}/dev/zero c 1 5
+ fi
if [ -n "${ROOTDIR}" ]; then
umount ${ROOTDIR}
rmdir ${ROOTDIR}
generated by cgit v0.12 at 2024-11-01 06:32:14 (GMT)