From 3d65494a8eda056377febda4642ce992e69a9371 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 7 Apr 2012 00:01:17 +0000 Subject: Sat Apr 7 00:01:16 UTC 2012 --- core/udev/PKGBUILD | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) (limited to 'core/udev/PKGBUILD') diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD index 114f524b9..082ed6213 100644 --- a/core/udev/PKGBUILD +++ b/core/udev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 153633 2012-03-16 22:34:33Z tomegun $ +# $Id: PKGBUILD 155730 2012-04-06 00:04:05Z tomegun $ # Maintainer: Tom Gundersen # Contributor: Aaron Griffin # Contributor: Tobias Powalowski @@ -6,15 +6,16 @@ pkgname=udev pkgver=181 -pkgrel=5 +pkgrel=9 pkgdesc="The userspace dev tools (udev)" -depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'acl') +depends=('util-linux' 'glib2' 'kmod' 'pciutils' 'usbutils' 'bash' 'acl') install=udev.install arch=(i686 x86_64) license=('GPL') -makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +makedepends=('gobject-introspection' 'gperf' 'libxslt') source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz - 0001-reinstate-TIMEOUT-handling.patch + 0001-split-usr-always-read-config-files-from-lib-udev.patch + 0002-reinstate-TIMEOUT-handling.patch initcpio-hooks-udev initcpio-install-udev) url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" @@ -25,19 +26,23 @@ options=(!makeflags !libtool) build() { cd $srcdir/$pkgname-$pkgver - patch -p1 -i ../0001-reinstate-TIMEOUT-handling.patch + patch -p1 -i ../0001-split-usr-always-read-config-files-from-lib-udev.patch + patch -p1 -i ../0002-reinstate-TIMEOUT-handling.patch ./configure --prefix=/usr \ - --with-rootprefix= \ --sysconfdir=/etc \ - --libdir=/usr/lib \ - --libexecdir=/lib \ - --with-systemdsystemunitdir=/lib/systemd/system \ + --libexecdir=/usr/lib \ + --with-systemdsystemunitdir=/usr/lib/systemd/system \ + --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware \ --enable-udev_acl make } - + +check() { + make -C "$pkgname-$pkgver" check +} + package() { cd $srcdir/$pkgname-$pkgver make DESTDIR=${pkgdir} install @@ -47,20 +52,24 @@ package() { install -D -m644 ../initcpio-install-udev ${pkgdir}/usr/lib/initcpio/install/udev # udevd moved, symlink to make life easy for restarting udevd manually - ln -s ../../lib/udev/udevd ${pkgdir}/usr/bin/udevd + ln -s ../lib/udev/udevd ${pkgdir}/usr/bin/udevd + # and for users of the old /lib location (to go away soon) + mkdir -p ${pkgdir}/lib/udev + ln -s ../../usr/lib/udev/udevd ${pkgdir}/lib/udev/udevd # the path to udevadm is hardcoded in some places install -d ${pkgdir}/sbin ln -s ../usr/bin/udevadm ${pkgdir}/sbin/udevadm # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - for i in $pkgdir/lib/udev/rules.d/*.rules; do + for i in $pkgdir/usr/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' - 'f758b3e62ab77a1a6b7be12bb900cb2d' + '02a0dbbdcba6c1eae3ef65b6b06bde1f' + 'a9fae85491a08d7759388c605389a8c5' 'a4dd853050bf2e0ae6b2e3d2c75499c2' - 'ee0bfe91a20fff12cc25ab1d1e024853') + 'd2b16edc6d806b5dafdbbad43ae5a3de') -- cgit v1.2.3-54-g00ecf