summaryrefslogtreecommitdiff
path: root/core/udev
diff options
context:
space:
mode:
Diffstat (limited to 'core/udev')
-rw-r--r--core/udev/81-arch.rules70
-rw-r--r--core/udev/PKGBUILD32
-rw-r--r--core/udev/udev.install58
3 files changed, 44 insertions, 116 deletions
diff --git a/core/udev/81-arch.rules b/core/udev/81-arch.rules
index 71f1a883b..6bdf4e249 100644
--- a/core/udev/81-arch.rules
+++ b/core/udev/81-arch.rules
@@ -1,71 +1,9 @@
-# Udev rules for Archlinux by Tobias Powalowski <tpowa@archlinux.org>
# do not edit this file, it will be overwritten on update
-#
-# There are a number of modifiers that are allowed to be used in some
-# of the different fields. They provide the following subsitutions:
-#
-# %n the "kernel number" of the device.
-# For example, 'sda3' has a "kernel number" of '3'
-# %k the kernel name for the device.
-# %M the kernel major number for the device
-# %m the kernel minor number for the device
-# %b the bus id for the device
-# %c the string returned by the PROGRAM
-# %s{filename} the content of a sysfs attribute.
-# %% the '%' char itself.
-#
-# There are a number of modifiers that are allowed to be used in some of the
-# fields. See the udev man page for a full description of them.
-# global stuff
-#
+# this file is going away in the near future
-# permission for sg devices
-KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660"
-
-# permissions for IDE CD devices
-SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical"
-
-# permissions for SCSI CD devices
-SUBSYSTEMS=="scsi", KERNEL=="s[rg][0-9]*", ATTRS{type}=="5", GROUP="optical"
-
-# permissions for removable devices like cardreaders or sticks
-KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage"
-
-# permissions for firewire external drives
-KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage"
-
-# permissions for usb to scsi external adapters
-KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage"
-
-# permissions for ide storage like pcmcia card readers
-ACTION!="add", GOTO="pcmcia_end"
-SUBSYSTEM!="block", GOTO="pcmcia_end"
-KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode"
-KERNEL=="hd*", IMPORT{parent}=="ID_*"
-KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage"
-LABEL="pcmcia_end"
-
-# permissions for SCSI scanners
-SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner"
-
-# mem
-KERNEL=="ram0", SYMLINK+="ramdisk"
-KERNEL=="ram1", SYMLINK+="ram"
-
-# video4linux
-
-KERNEL=="vbi0", SYMLINK+="vbi"
-KERNEL=="radio0", SYMLINK+="radio"
-KERNEL=="radio[0-9]*", GROUP="video"
-KERNEL=="video0", SYMLINK+="video"
-KERNEL=="vtx0", SYMLINK+="vtx"
-
-# misc
-KERNEL=="sgi_fetchop", MODE="0666"
+# this might belong in <http://aur.archlinux.org/packages.php?ID=22698>
+# see also /usr/src/*/Documentation/laptops/sonypi.txt
KERNEL=="sonypi", MODE="0666"
-# USB devices
+# this might belong in <https://aur.archlinux.org/packages.php?ID=18393>
KERNEL=="legousbtower*", MODE="0666"
-#######################################
-# Permissions and Symlinks - end
-#######################################
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index bab6a2cbe..544af8f71 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 134147 2011-08-02 11:38:00Z tomegun $
+# $Id: PKGBUILD 141114 2011-10-24 09:59:24Z dreisner $
# Maintainer: Aaron Griffin <aaron@archlinux.org>
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Bächler <thomas@archlinux.org>
@@ -6,23 +6,21 @@
pkgbase="udev"
pkgname=('udev' 'udev-compat')
-pkgver=173
-pkgrel=3
+pkgver=174
+pkgrel=1
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
license=('GPL')
groups=('base')
-# older initscripts versions required start_udev
options=(!makeflags !libtool)
-makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
-source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
- bluetooth.patch
+makedepends=('gobject-introspection' 'gperf')
+#source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.bz2
+source=(http://people.freedesktop.org/~kay/$pkgbase-$pkgver.tar.bz2
81-arch.rules)
build() {
cd $srcdir/$pkgbase-$pkgver
- # fix https://bugs.archlinux.org/task/25356 (submitted upstream)
- patch -Np1 -i ../bluetooth.patch
+
./configure --sysconfdir=/etc\
--with-rootlibdir=/lib\
--libexecdir=/lib/udev\
@@ -30,13 +28,13 @@ build() {
--with-systemdsystemunitdir=/lib/systemd/system\
--disable-rule-generator\
--enable-udev_acl
+
make
}
package_udev() {
pkgdesc="The userspace dev tools (udev)"
- depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2'
- 'module-init-tools>=3.11' 'pciutils')
+ depends=('util-linux' 'libusb-compat' 'glib2' 'module-init-tools' 'pciutils')
install=udev.install
backup=(etc/udev/udev.conf)
conflicts=('pcmcia-cs' 'hotplug' 'initscripts<2009.07')
@@ -53,11 +51,14 @@ package_udev() {
echo "blacklist $mod"
done | sort -u > $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
- # these static devices are created for convenience, to autoload the modules if necessary
- # /dev/loop0
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # may be obsoleted by https://lkml.org/lkml/2011/7/30/111
mknod -m 0660 ${pkgdir}/lib/udev/devices/loop0 b 7 0
chgrp disk ${pkgdir}/lib/udev/devices/loop0
+ # udevd moved, symlink to make life easy for restarting udevd manually
+ ln -s /lib/udev/udevd ${pkgdir}/sbin/udevd
+
# 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;
@@ -96,6 +97,5 @@ package_udev-compat() {
# /dev/ppp
mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0
}
-md5sums=('91a88a359b60bbd074b024883cc0dbde'
- '36cb9bfb55a8d931b7498d2e46730745'
- 'ec529eb1ddaabb70c61b38f80bb8462a')
+md5sums=('3b84706046a33d7a7e00491a1136804d'
+ '3da2bb9891592f9438a07bd641465531')
diff --git a/core/udev/udev.install b/core/udev/udev.install
index 272ab60c0..2cc8caaa0 100644
--- a/core/udev/udev.install
+++ b/core/udev/udev.install
@@ -2,7 +2,7 @@
# arg 2: the old package version
post_upgrade() {
- if [ "$(vercmp $2 172)" -lt 0 ]; then
+ if [ "$(vercmp $2 174)" -lt 0 ]; then
echo "ATTENTION UDEV:"
echo "----------"
if [ "$(vercmp $2 168)" -lt 0 ]; then
@@ -32,41 +32,31 @@ post_upgrade() {
echo "Add them to MODULES in rc.conf if you need them."
echo " --"
fi
- echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
- echo " --"
- echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
- echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
- echo "takes precedence."
+ if [ "$(vercmp $2 172)" -lt 0 ]; then
+ echo "Support for non-devtmpfs self-compiled kernels have been moved to udev-compat."
+ echo " --"
+ echo "Blacklisting of framebuffer devices has moved from /etc/modprobe.d to"
+ echo "/lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it"
+ echo "takes precedence."
+ echo " --"
+ echo "kbd and rtc devices are no longer world readable."
+ echo " --"
+ echo "rtc is no longer in the audio group and fb devices are no longer in"
+ echo "the video group, as permissions and ownership of fb devices are controlled"
+ echo "by X."
+ echo " --"
+ fi
+ echo "We now use upstream rules for assigning devices to the 'disk', 'optical',"
+ echo "'scanner' and 'video' groups. Beware of any changes."
echo " --"
- echo "kbd and rtc devices are no longer world readable."
+ echo "We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
echo " --"
- echo "rtc is no longer in the audio group and fb devices are no longer in"
- echo "the video group, as permissions and ownership of fb devices are controlled"
- echo "by X."
+ echo "For security reasons, we no longer add devices to the 'storage' group. Use"
+ echo "udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
+ echo "this functionality back."
+ echo " --"
+ echo "We no longer create the static nodes on install needed for an initrd-less and"
+ echo "devtmpfs-less boot, this only affects fresh installs."
echo "---------------"
fi
}
-
-post_install() {
- # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist
- # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible
- ROOTDIR=""
- [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX)
- [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR}
- 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 -f ${ROOTDIR}/dev/zero
- mknod -m644 ${ROOTDIR}/dev/zero c 1 5
- fi
- if [ -n "${ROOTDIR}" ]; then
- umount ${ROOTDIR}
- rmdir ${ROOTDIR}
- fi
-}