[arch-commits] Commit in udev/repos (6 files)
Date: Wednesday, February 8, 2012 @ 09:02:24
Author: tomegun
Revision: 149551
db-move: moved udev from [staging] to [testing] (i686)
Added:
udev/repos/testing-i686/
udev/repos/testing-i686/PKGBUILD
(from rev 149550, udev/repos/staging-i686/PKGBUILD)
udev/repos/testing-i686/initcpio-hooks-udev
(from rev 149550, udev/repos/staging-i686/initcpio-hooks-udev)
udev/repos/testing-i686/initcpio-install-udev
(from rev 149550, udev/repos/staging-i686/initcpio-install-udev)
udev/repos/testing-i686/udev.install
(from rev 149550, udev/repos/staging-i686/udev.install)
Deleted:
udev/repos/staging-i686/
---+
PKGBUILD | 65 ++
initcpio-hooks-udev |9 +
initcpio-install-udev | 26 +
udev.install | 73
4 files changed, 173 insertions(+)
Copied: udev/repos/testing-i686/PKGBUILD (from rev 149550,
udev/repos/staging-i686/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-02-08 14:02:24 UTC (rev 149551)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgname=udev
+pkgver=181
+pkgrel=2
+pkgdesc=The userspace dev tools (udev)
+depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+install=udev.install
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
+ initcpio-hooks-udev
+ initcpio-install-udev)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+backup=(etc/udev/udev.conf)
+groups=('base')
+options=(!makeflags !libtool)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. Support for this will go away in a future version of
udev
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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}/usr/bin/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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+
+ # install the mkinitpcio hook
+ install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
+ install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
+}
+md5sums=('0d7af750702620a871b9f9b98d8ad859'
+ 'a4dd853050bf2e0ae6b2e3d2c75499c2'
+ 'ee0bfe91a20fff12cc25ab1d1e024853')
Copied: udev/repos/testing-i686/initcpio-hooks-udev (from rev 149550,
udev/repos/staging-i686/initcpio-hooks-udev)
===
--- testing-i686/initcpio-hooks-udev(rev 0)
+++ testing-i686/initcpio-hooks-udev2012-02-08 14:02:24 UTC (rev 149551)
@@ -0,0 +1,9 @@
+# vim: set ft=sh:
+run_hook ()
+{
+msg -n :: Triggering uevents...
+udevadm trigger --action=add --type=subsystems
+udevadm trigger --action=add --type=devices
+udevadm settle
+msg done.
+}
Copied: udev/repos/testing-i686/initcpio-install-udev (from rev 149550,
udev/repos/staging-i686/initcpio-install-udev)
===
--- testing-i686/initcpio-install-udev (rev 0)
+++ testing-i686/initcpio-install-udev 2012-02-08 14:02:24 UTC (rev 149551)
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+build() {
+FILES=/etc/udev/udev.conf
+SCRIPT=udev
+
+add_binary /lib/udev/udevd
+add_binary /usr/bin/udevadm
+
+for rules in 50-udev-default.rules 60-persistent-storage.rules
80-drivers.rules; do
+add_file /lib/udev/rules.d/$rules
+done
+for tool in ata_id scsi_id; do
+add_file /lib/udev/$tool
+done
+}
+
+help() {
+cat HELPEOF
+This hook will use udev to create your root device node and detect the needed
+modules for your root
[arch-commits] Commit in udev/repos (6 files)
Date: Wednesday, February 8, 2012 @ 09:02:25
Author: tomegun
Revision: 149552
db-move: moved udev from [staging] to [testing] (x86_64)
Added:
udev/repos/testing-x86_64/
udev/repos/testing-x86_64/PKGBUILD
(from rev 149550, udev/repos/staging-x86_64/PKGBUILD)
udev/repos/testing-x86_64/initcpio-hooks-udev
(from rev 149550, udev/repos/staging-x86_64/initcpio-hooks-udev)
udev/repos/testing-x86_64/initcpio-install-udev
(from rev 149550, udev/repos/staging-x86_64/initcpio-install-udev)
udev/repos/testing-x86_64/udev.install
(from rev 149550, udev/repos/staging-x86_64/udev.install)
Deleted:
udev/repos/staging-x86_64/
---+
PKGBUILD | 65 ++
initcpio-hooks-udev |9 +
initcpio-install-udev | 26 +
udev.install | 73
4 files changed, 173 insertions(+)
Copied: udev/repos/testing-x86_64/PKGBUILD (from rev 149550,
udev/repos/staging-x86_64/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-08 14:02:25 UTC (rev 149552)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgname=udev
+pkgver=181
+pkgrel=2
+pkgdesc=The userspace dev tools (udev)
+depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+install=udev.install
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz
+ initcpio-hooks-udev
+ initcpio-install-udev)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+backup=(etc/udev/udev.conf)
+groups=('base')
+options=(!makeflags !libtool)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. Support for this will go away in a future version of
udev
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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}/usr/bin/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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+
+ # install the mkinitpcio hook
+ install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev
+ install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev
+}
+md5sums=('0d7af750702620a871b9f9b98d8ad859'
+ 'a4dd853050bf2e0ae6b2e3d2c75499c2'
+ 'ee0bfe91a20fff12cc25ab1d1e024853')
Copied: udev/repos/testing-x86_64/initcpio-hooks-udev (from rev 149550,
udev/repos/staging-x86_64/initcpio-hooks-udev)
===
--- testing-x86_64/initcpio-hooks-udev (rev 0)
+++ testing-x86_64/initcpio-hooks-udev 2012-02-08 14:02:25 UTC (rev 149552)
@@ -0,0 +1,9 @@
+# vim: set ft=sh:
+run_hook ()
+{
+msg -n :: Triggering uevents...
+udevadm trigger --action=add --type=subsystems
+udevadm trigger --action=add --type=devices
+udevadm settle
+msg done.
+}
Copied: udev/repos/testing-x86_64/initcpio-install-udev (from rev 149550,
udev/repos/staging-x86_64/initcpio-install-udev)
===
--- testing-x86_64/initcpio-install-udev(rev 0)
+++ testing-x86_64/initcpio-install-udev2012-02-08 14:02:25 UTC (rev
149552)
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+build() {
+FILES=/etc/udev/udev.conf
+SCRIPT=udev
+
+add_binary /lib/udev/udevd
+add_binary /usr/bin/udevadm
+
+for rules in 50-udev-default.rules 60-persistent-storage.rules
80-drivers.rules; do
+add_file /lib/udev/rules.d/$rules
+done
+for tool in ata_id scsi_id; do
+add_file /lib/udev/$tool
+done
+}
+
+help() {
+cat HELPEOF
+This hook will use udev to create your root device
[arch-commits] Commit in udev/repos (6 files)
Date: Tuesday, February 7, 2012 @ 15:56:41
Author: tomegun
Revision: 149449
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
udev/repos/staging-i686/
udev/repos/staging-i686/PKGBUILD
(from rev 149448, udev/trunk/PKGBUILD)
udev/repos/staging-i686/udev.install
(from rev 149448, udev/trunk/udev.install)
udev/repos/staging-x86_64/
udev/repos/staging-x86_64/PKGBUILD
(from rev 149448, udev/trunk/PKGBUILD)
udev/repos/staging-x86_64/udev.install
(from rev 149448, udev/trunk/udev.install)
-+
staging-i686/PKGBUILD | 57
staging-i686/udev.install | 73 ++
staging-x86_64/PKGBUILD | 57
staging-x86_64/udev.install | 73 ++
4 files changed, 260 insertions(+)
Copied: udev/repos/staging-i686/PKGBUILD (from rev 149448, udev/trunk/PKGBUILD)
===
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-02-07 20:56:41 UTC (rev 149449)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgname=udev
+pkgver=181
+pkgrel=1
+pkgdesc=The userspace dev tools (udev)
+depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+install=udev.install
+arch=(i686 x86_64)
+license=('GPL')
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+backup=(etc/udev/udev.conf)
+groups=('base')
+options=(!makeflags !libtool)
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --libdir=/usr/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. In that case move this to udev-compat
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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}/usr/bin/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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+}
+md5sums=('0d7af750702620a871b9f9b98d8ad859')
Copied: udev/repos/staging-i686/udev.install (from rev 149448,
udev/trunk/udev.install)
===
--- staging-i686/udev.install (rev 0)
+++ staging-i686/udev.install 2012-02-07 20:56:41 UTC (rev 149449)
@@ -0,0 +1,73 @@
+# arg 1: the new package version
+# arg 2: the old package version
+
+post_upgrade() {
+ if [ $(vercmp $2 181) -lt 0 ]; then
+echo ATTENTION UDEV:
+echo --
+if [ $(vercmp $2 168) -lt 0 ]; then
+ echo Kernel 2.6.32 or newer is now required.
+ echo --
+ echo OSS emulation modules are not loaded by default, add to rc.conf if
needed.
+ echo --
+ echo Arch specific cd symlinks are now no longer created.
+ echo --
+ echo cd and net persistent rules will no longer be autogenerated,
+ echo see https://wiki.archlinux.org/index.php/Udev for details.
+ echo --
+ echo Errors are now logged (possibly to the console) by default.
+ echo --
+fi
+if [ $(vercmp $2 171) -lt 0 ]; then
+ echo Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD
and
+ echo blacklisting in MODULES no longer works.
+ echo See 'man modprobe.conf' for a replacement to blacklisting.
+ echo To disable a module mod1 on the kernel command line, use
+ echo mod1.disable=1
+ echo or
+ echo modprobe.blacklist=mod1
+ echo --
+ echo The following modules are no longer unconditionally loaded:
+ echo pcspkr irtty-sir analog lp ppdev ide-generic
+ echo Add them to MODULES in rc.conf if you need them.
+ echo --
+fi
+if [ $(vercmp $2 172) -lt 0 ]; then
+ echo Blacklisting of framebuffer devices has moved from /etc/modprobe.d
to
+ echo /lib/modprobe.d. Any
[arch-commits] Commit in udev/repos (6 files)
Date: Sunday, January 29, 2012 @ 05:36:19
Author: tomegun
Revision: 147974
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
udev/repos/testing-i686/
udev/repos/testing-i686/PKGBUILD
(from rev 147973, udev/trunk/PKGBUILD)
udev/repos/testing-i686/udev.install
(from rev 147973, udev/trunk/udev.install)
udev/repos/testing-x86_64/
udev/repos/testing-x86_64/PKGBUILD
(from rev 147973, udev/trunk/PKGBUILD)
udev/repos/testing-x86_64/udev.install
(from rev 147973, udev/trunk/udev.install)
-+
testing-i686/PKGBUILD | 102 ++
testing-i686/udev.install | 65 ++
testing-x86_64/PKGBUILD | 102 ++
testing-x86_64/udev.install | 65 ++
4 files changed, 334 insertions(+)
Copied: udev/repos/testing-i686/PKGBUILD (from rev 147973, udev/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-29 10:36:19 UTC (rev 147974)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgbase=udev
+pkgname=('udev' 'udev-compat')
+pkgver=180
+pkgrel=1
+arch=(i686 x86_64)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+license=('GPL')
+groups=('base')
+options=(!makeflags !libtool)
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --bindir=/sbin \
+ --libdir=/usr/lib \
+ --with-rootlibdir=/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package_udev() {
+ pkgdesc=The userspace dev tools (udev)
+ depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+ install=udev.install
+ backup=(etc/udev/udev.conf)
+
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # create framebuffer blacklist
+ install -d -m755 ${pkgdir}/lib/modprobe.d/
+ for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz'
-exec basename {} .ko.gz \;); do
+ echo blacklist $mod
+ done | sort -u $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. In that case move this to udev-compat
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+}
+
+package_udev-compat() {
+ pkgdesc=The userspace dev tools (udev) - additional rules for older kernels
+ depends=('udev')
+ groups=('')
+ install -d -m755 ${pkgdir}/lib/udev/rules.d
+ install -D -m644
${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules
${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+
+ # create static nodes to be compatible with on-demand module
+ # loading in the most recent kernel
+ #
+ # the list of nodes is generated from /lib/modules/`most recent
kernel`/modprobe.devname
+ # excluding any devices not included in the LTS kernel and any entries in the
+ # modprobe.devname file of the LTS kernel (if it exists).
+
+ install -d -m755 ${pkgdir}/lib/udev/devices
+ cd ${pkgdir}/lib/udev/devices
+
+ install -d -m755 net
+ mknod net/tun c 10 200
+ mknod ppp c 108 0
+# mknod loop-control c 10 237 -- does not exist in old kernels
+ mknod uinput c 10 223
+ install -d -m755 mapper
+ mknod mapper/control c 10 236
+ install -d -m755 snd
+ mknod snd/timer c 116 33
+ mknod snd/seq c 116 1
+ mknod btrfs-control c 10 234
+ mknod autofs c 10 235
+ mknod fuse c 10 229
+ install -d -m755 cpu
+ mknod cpu/microcode c 10 184
+
+}
+md5sums=('1cf124ab5a124ea35d4748ea414926ec')
Copied: udev/repos/testing-i686/udev.install (from rev 147973,
udev/trunk/udev.install)
===
--- testing-i686/udev.install (rev 0)
+++
[arch-commits] Commit in udev/repos (6 files)
Date: Wednesday, January 25, 2012 @ 11:27:41
Author: tomegun
Revision: 147272
db-move: moved udev from [testing] to [core] (i686)
Added:
udev/repos/core-i686/PKGBUILD
(from rev 147271, udev/repos/testing-i686/PKGBUILD)
udev/repos/core-i686/udev.install
(from rev 147271, udev/repos/testing-i686/udev.install)
Deleted:
udev/repos/core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
udev/repos/core-i686/PKGBUILD
udev/repos/core-i686/udev.install
udev/repos/testing-i686/
+
0001-udevd-kill-hanging-event-processes-after-30-seconds.patch | 162 ---
PKGBUILD | 205
--
udev.install | 130 +++---
3 files changed, 167 insertions(+), 330 deletions(-)
Deleted:
core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
===
--- core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-25 15:45:40 UTC (rev 147271)
+++ core-i686/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-25 16:27:41 UTC (rev 147272)
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers kay.siev...@vrfy.org
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
- src/udev-event.c |2 +-
- src/udevd.c | 62 +++--
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
- udev_list_init(udev, event-run_list, false);
- event-fd_signal = -1;
- event-birth_usec = now_usec();
--event-timeout_usec = 60 * 1000 * 1000;
-+event-timeout_usec = 30 * 1000 * 1000;
- dbg(event-udev, allocated event %p\n, event);
- return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
- struct udev_monitor *monitor;
- enum worker_state state;
- struct event *event;
-+unsigned long long event_start_usec;
- };
-
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
- close(fd_inotify);
- close(worker_watch[WRITE_END]);
- udev_rules_unref(rules);
-+udev_builtin_exit(udev);
- udev_monitor_unref(worker_monitor);
- udev_unref(udev);
- udev_log_close();
-@@ -389,6 +391,7 @@ out:
- worker-monitor = worker_monitor;
- worker-pid = pid;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- worker-event = event;
- event-state = EVENT_RUNNING;
- udev_list_node_append(worker-node, worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
- worker_ref(worker);
- worker-event = event;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- event-state = EVENT_RUNNING;
- return;
- }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
- continue;
-
- /* worker returned */
--worker-event-exitcode = msg.exitcode;
--event_queue_delete(worker-event, true);
--worker-event = NULL;
-+if (worker-event) {
-+worker-event-exitcode = msg.exitcode;
-+event_queue_delete(worker-event, true);
-+worker-event = NULL;
-+}
- if (worker-state != WORKER_KILLED)
- worker-state = WORKER_IDLE;
- worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
-
[arch-commits] Commit in udev/repos (6 files)
Date: Wednesday, January 25, 2012 @ 11:27:42
Author: tomegun
Revision: 147273
db-move: moved udev from [testing] to [core] (x86_64)
Added:
udev/repos/core-x86_64/PKGBUILD
(from rev 147271, udev/repos/testing-x86_64/PKGBUILD)
udev/repos/core-x86_64/udev.install
(from rev 147271, udev/repos/testing-x86_64/udev.install)
Deleted:
udev/repos/core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
udev/repos/core-x86_64/PKGBUILD
udev/repos/core-x86_64/udev.install
udev/repos/testing-x86_64/
+
0001-udevd-kill-hanging-event-processes-after-30-seconds.patch | 162 ---
PKGBUILD | 205
--
udev.install | 130 +++---
3 files changed, 167 insertions(+), 330 deletions(-)
Deleted:
core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
===
--- core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-25 16:27:41 UTC (rev 147272)
+++ core-x86_64/0001-udevd-kill-hanging-event-processes-after-30-seconds.patch
2012-01-25 16:27:42 UTC (rev 147273)
@@ -1,162 +0,0 @@
-From e64fae5573e566ce4fd9b23c68ac8f3096603314 Mon Sep 17 00:00:00 2001
-From: Kay Sievers kay.siev...@vrfy.org
-Date: Wed, 18 Jan 2012 05:06:18 +0100
-Subject: [PATCH] udevd: kill hanging event processes after 30 seconds
-
-Some broken kernel drivers load firmware synchronously in the module init
-path and block modprobe until the firmware request is fulfilled.
-
-The modprobe-generated firmware request is a direct child device of the
-device which caused modprobe to run. Child device event are blocked until
-the parent device is handled. This dead-locks until the kernel firmware
-loading timeout of 60 seconds is reached.
-
-The hanging modprobe event should now time-out and allow the firmware
-event to run before the 60 second kernel timeout.
- src/udev-event.c |2 +-
- src/udevd.c | 62 +++--
- 2 files changed, 51 insertions(+), 13 deletions(-)
-
-diff --git a/src/udev-event.c b/src/udev-event.c
-index 9bdc518..f0b9548 100644
a/src/udev-event.c
-+++ b/src/udev-event.c
-@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
- udev_list_init(udev, event-run_list, false);
- event-fd_signal = -1;
- event-birth_usec = now_usec();
--event-timeout_usec = 60 * 1000 * 1000;
-+event-timeout_usec = 30 * 1000 * 1000;
- dbg(event-udev, allocated event %p\n, event);
- return event;
- }
-diff --git a/src/udevd.c b/src/udevd.c
-index 11ab19a..77a1e79 100644
a/src/udevd.c
-+++ b/src/udevd.c
-@@ -133,6 +133,7 @@ struct worker {
- struct udev_monitor *monitor;
- enum worker_state state;
- struct event *event;
-+unsigned long long event_start_usec;
- };
-
- /* passed from worker to main process */
-@@ -372,6 +373,7 @@ out:
- close(fd_inotify);
- close(worker_watch[WRITE_END]);
- udev_rules_unref(rules);
-+udev_builtin_exit(udev);
- udev_monitor_unref(worker_monitor);
- udev_unref(udev);
- udev_log_close();
-@@ -389,6 +391,7 @@ out:
- worker-monitor = worker_monitor;
- worker-pid = pid;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- worker-event = event;
- event-state = EVENT_RUNNING;
- udev_list_node_append(worker-node, worker_list);
-@@ -419,6 +422,7 @@ static void event_run(struct event *event)
- worker_ref(worker);
- worker-event = event;
- worker-state = WORKER_RUNNING;
-+worker-event_start_usec = now_usec();
- event-state = EVENT_RUNNING;
- return;
- }
-@@ -610,9 +614,11 @@ static void worker_returned(int fd_worker)
- continue;
-
- /* worker returned */
--worker-event-exitcode = msg.exitcode;
--event_queue_delete(worker-event, true);
--worker-event = NULL;
-+if (worker-event) {
-+worker-event-exitcode = msg.exitcode;
-+event_queue_delete(worker-event, true);
-+worker-event = NULL;
-+}
- if (worker-state != WORKER_KILLED)
- worker-state = WORKER_IDLE;
- worker_unref(worker);
-@@ -796,7 +802,7 @@ static void handle_signal(struct udev *udev, int signo)
-
[arch-commits] Commit in udev/repos (6 files)
Date: Tuesday, January 24, 2012 @ 18:31:40
Author: tomegun
Revision: 147236
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
udev/repos/testing-i686/
udev/repos/testing-i686/PKGBUILD
(from rev 147235, udev/trunk/PKGBUILD)
udev/repos/testing-i686/udev.install
(from rev 147235, udev/trunk/udev.install)
udev/repos/testing-x86_64/
udev/repos/testing-x86_64/PKGBUILD
(from rev 147235, udev/trunk/PKGBUILD)
udev/repos/testing-x86_64/udev.install
(from rev 147235, udev/trunk/udev.install)
-+
testing-i686/PKGBUILD | 102 ++
testing-i686/udev.install | 65 ++
testing-x86_64/PKGBUILD | 102 ++
testing-x86_64/udev.install | 65 ++
4 files changed, 334 insertions(+)
Copied: udev/repos/testing-i686/PKGBUILD (from rev 147235, udev/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-24 23:31:40 UTC (rev 147236)
@@ -0,0 +1,102 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgbase=udev
+pkgname=('udev' 'udev-compat')
+pkgver=179
+pkgrel=1
+arch=(i686 x86_64)
+url=http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary;
+license=('GPL')
+groups=('base')
+options=(!makeflags !libtool)
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --bindir=/sbin \
+ --libdir=/usr/lib \
+ --with-rootlibdir=/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package_udev() {
+ pkgdesc=The userspace dev tools (udev)
+ depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils')
+ install=udev.install
+ backup=(etc/udev/udev.conf)
+
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # create framebuffer blacklist
+ install -d -m755 ${pkgdir}/lib/modprobe.d/
+ for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz'
-exec basename {} .ko.gz \;); do
+ echo blacklist $mod
+ done | sort -u $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. In that case move this to udev-compat
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+}
+
+package_udev-compat() {
+ pkgdesc=The userspace dev tools (udev) - additional rules for older kernels
+ depends=('udev')
+ groups=('')
+ install -d -m755 ${pkgdir}/lib/udev/rules.d
+ install -D -m644
${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules
${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+
+ # create static nodes to be compatible with on-demand module
+ # loading in the most recent kernel
+ #
+ # the list of nodes is generated from /lib/modules/`most recent
kernel`/modprobe.devname
+ # excluding any devices not included in the LTS kernel and any entries in the
+ # modprobe.devname file of the LTS kernel (if it exists).
+
+ install -d -m755 ${pkgdir}/lib/udev/devices
+ cd ${pkgdir}/lib/udev/devices
+
+ install -d -m755 net
+ mknod net/tun c 10 200
+ mknod ppp c 108 0
+# mknod loop-control c 10 237 -- does not exist in old kernels
+ mknod uinput c 10 223
+ install -d -m755 mapper
+ mknod mapper/control c 10 236
+ install -d -m755 snd
+ mknod snd/timer c 116 33
+ mknod snd/seq c 116 1
+ mknod btrfs-control c 10 234
+ mknod autofs c 10 235
+ mknod fuse c 10 229
+ install -d -m755 cpu
+ mknod cpu/microcode c 10 184
+
+}
+md5sums=('7d2880f66ea39146aae928f19ff3ca09')
Copied: udev/repos/testing-i686/udev.install (from rev 147235,
udev/trunk/udev.install)
===
--- testing-i686/udev.install (rev 0)
+++
[arch-commits] Commit in udev/repos (6 files)
Date: Thursday, January 12, 2012 @ 15:45:08
Author: tomegun
Revision: 146541
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
udev/repos/testing-i686/
udev/repos/testing-i686/PKGBUILD
(from rev 146540, udev/trunk/PKGBUILD)
udev/repos/testing-i686/udev.install
(from rev 146540, udev/trunk/udev.install)
udev/repos/testing-x86_64/
udev/repos/testing-x86_64/PKGBUILD
(from rev 146540, udev/trunk/PKGBUILD)
udev/repos/testing-x86_64/udev.install
(from rev 146540, udev/trunk/udev.install)
-+
testing-i686/PKGBUILD | 105 ++
testing-i686/udev.install | 65 ++
testing-x86_64/PKGBUILD | 105 ++
testing-x86_64/udev.install | 65 ++
4 files changed, 340 insertions(+)
Copied: udev/repos/testing-i686/PKGBUILD (from rev 146540, udev/trunk/PKGBUILD)
===
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-01-12 20:45:08 UTC (rev 146541)
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: Tom Gundersen t...@jklm.no
+# Contributor: Aaron Griffin aa...@archlinux.org
+# Contributor: Tobias Powalowski tp...@archlinux.org
+# Contributor: Thomas Bächler tho...@archlinux.org
+
+pkgbase=udev
+pkgname=('udev' 'udev-compat')
+pkgver=177
+pkgrel=1
+arch=(i686 x86_64)
+url=http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html;
+license=('GPL')
+groups=('base')
+options=(!makeflags !libtool)
+makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod')
+source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgbase-$pkgver.tar.xz)
+
+build() {
+ cd $srcdir/$pkgbase-$pkgver
+
+ ./configure --prefix=/usr \
+ --with-rootprefix= \
+ --sysconfdir=/etc \
+ --bindir=/sbin \
+ --libdir=/usr/lib \
+ --with-rootlibdir=/lib \
+ --libexecdir=/lib \
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --enable-udev_acl
+
+ make
+}
+
+package_udev() {
+ pkgdesc=The userspace dev tools (udev)
+ depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils'
'pciutils' 'glib2')
+ install=udev.install
+ backup=(etc/udev/udev.conf)
+ conflicts=('pcmcia-cs' 'hotplug' 'initscripts2009.07')
+ replaces=('devfsd')
+
+ cd $srcdir/$pkgbase-$pkgver
+ make DESTDIR=${pkgdir} install
+
+ # create framebuffer blacklist
+ install -d -m755 ${pkgdir}/lib/modprobe.d/
+ for mod in $(find /lib/modules/*/kernel/drivers/video -name '*fb.ko.gz'
-exec basename {} .ko.gz \;); do
+ echo blacklist $mod
+ done | sort -u $pkgdir/lib/modprobe.d/framebuffer_blacklist.conf
+
+ # /dev/loop0 is created for convenience, to autoload the module if necessary
+ # this is no longer needed when util-linux-2.21 is released as
/dev/loop-control
+ # will be used instead. In that case move this to udev-compat
+ install -d -m755 ${pkgdir}/lib/udev/devices/
+ mknod ${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;
+ s#GROUP=tape#GROUP=storage#g;
+ s#GROUP=cdrom#GROUP=optical#g' $i
+ done
+}
+
+package_udev-compat() {
+ pkgdesc=The userspace dev tools (udev) - additional rules for older kernels
+ depends=('udev')
+ groups=('')
+ install -d -m755 ${pkgdir}/lib/udev/rules.d
+ install -D -m644
${srcdir}/${pkgbase}-${pkgver}/rules/misc/30-kernel-compat.rules
${pkgdir}/lib/udev/rules.d/30-kernel-compat.rules
+
+ # create static nodes to be compatible with on-demand module
+ # loading in the most recent kernel
+ #
+ # the list of nodes is generated from /lib/modules/`most recent
kernel`/modprobe.devname
+ # excluding any devices not included in the LTS kernel and any entries in the
+ # modprobe.devname file of the LTS kernel (if it exists).
+
+ install -d -m755 ${pkgdir}/lib/udev/devices
+ cd ${pkgdir}/lib/udev/devices
+
+ install -d -m755 net
+ mknod net/tun c 10 200
+ mknod ppp c 108 0
+# mknod loop-control c 10 237 -- does not exist in old kernels
+ mknod uinput c 10 223
+ install -d -m755 mapper
+ mknod mapper/control c 10 236
+ install -d -m755 snd
+ mknod snd/timer c 116 33
+ mknod snd/seq c 116 1
+ mknod btrfs-control c 10 234
+ mknod autofs c 10 235
+ mknod fuse c 10 229
+ install -d -m755 cpu
+ mknod cpu/microcode c 10 184
+
+}
+
+md5sums=('b4e00faf8153fd7202a7ef609284b0c3')
Copied: udev/repos/testing-i686/udev.install (from rev 146540,
udev/trunk/udev.install)
