diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-26 13:37:37 +0200 |
| commit | 978b7973febf9b1fee624681f33c805e4f04f5dd (patch) | |
| tree | 73ae74deb425418dce2090020d169406e71d5b51 /core/udev | |
| parent | 6646a7a49f1ff4228204490260b3e0f0e12b5d3c (diff) | |
| parent | a5721a07196cf00c26ea1bfb651aab756d202ccb (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/lxappearance/PKGBUILD
community/menu-cache/PKGBUILD
extra/kdemultimedia/PKGBUILD
extra/llvm/PKGBUILD
extra/qt/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sqlite/PKGBUILD
extra/wireshark/PKGBUILD
multilib/lib32-llvm/PKGBUILD
testing/mdadm/PKGBUILD
testing/udev/PKGBUILD
Diffstat (limited to 'core/udev')
| -rw-r--r-- | core/udev/PKGBUILD | 20 | ||||
| -rw-r--r-- | core/udev/initcpio-hooks-udev | 21 | ||||
| -rw-r--r-- | core/udev/initcpio-install-udev | 6 |
3 files changed, 30 insertions, 17 deletions
diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index e859ab6f7..4818c8e4a 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 158599 2012-05-05 02:34:43Z dreisner $ +# $Id: PKGBUILD 159406 2012-05-23 20:09:27Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -6,9 +6,9 @@ pkgname=udev pkgver=182 -pkgrel=2 +pkgrel=4 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') +depends=('util-linux' 'glib2' 'kmod' 'hwids' 'bash' 'acl') install=udev.install arch=(i686 x86_64 mips64el) license=('GPL') @@ -22,6 +22,11 @@ url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" backup=(etc/udev/udev.conf) groups=('base') options=(!makeflags !libtool) +md5sums=('023877e6cc0d907994b8c648beab542b' + '0fa3eac115ad0140af1582d941b15f2c' + '94b816896bf23275c0598fc8e07270c3' + 'e433c11d38cf4f877b41d06e2753ebe0' + 'e6faf4c3fe456f10d8efd2487d5e3cb7') build() { cd $srcdir/$pkgname-$pkgver @@ -33,7 +38,9 @@ build() { --sysconfdir=/etc \ --libexecdir=/usr/lib \ --with-systemdsystemunitdir=/usr/lib/systemd/system \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ + --with-usb-ids-path=/usr/share/hwdata/usb.ids \ + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } @@ -67,8 +74,3 @@ package() { s#GROUP="cdrom"#GROUP="optical"#g' $i done } -md5sums=('023877e6cc0d907994b8c648beab542b' - '0fa3eac115ad0140af1582d941b15f2c' - '94b816896bf23275c0598fc8e07270c3' - 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'd2b16edc6d806b5dafdbbad43ae5a3de') diff --git a/core/udev/initcpio-hooks-udev b/core/udev/initcpio-hooks-udev index 87aa7960f..313a88130 100644 --- a/core/udev/initcpio-hooks-udev +++ b/core/udev/initcpio-hooks-udev @@ -1,9 +1,20 @@ -# vim: set ft=sh: -run_hook () -{ - msg -n ":: Triggering uevents..." +#!/usr/bin/ash + +run_earlyhook() { + /usr/lib/udev/udevd --daemon --resolve-names=never + udevd_running=1 +} + +run_hook() { + msg ":: Triggering uevents..." udevadm trigger --action=add --type=subsystems udevadm trigger --action=add --type=devices udevadm settle - msg "done." } + +run_cleanuphook() { + udevadm control --exit + udevadm info --cleanup-db +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/core/udev/initcpio-install-udev b/core/udev/initcpio-install-udev index 6bc9cfb28..e33664459 100644 --- a/core/udev/initcpio-install-udev +++ b/core/udev/initcpio-install-udev @@ -1,9 +1,7 @@ #!/bin/bash build() { - FILES="/etc/udev/udev.conf" - SCRIPT="udev" - + add_file "/etc/udev/udev.conf" add_binary /usr/lib/udev/udevd add_binary /usr/bin/udevadm @@ -13,6 +11,8 @@ build() { for tool in ata_id scsi_id; do add_file "/usr/lib/udev/$tool" done + + add_runscript } help() { |