summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/udev/PKGBUILD27
-rw-r--r--abs/core/udev/udev.install2
2 files changed, 10 insertions, 19 deletions
diff --git a/abs/core/udev/PKGBUILD b/abs/core/udev/PKGBUILD
index c7ad8b3..de372ed 100644
--- a/abs/core/udev/PKGBUILD
+++ b/abs/core/udev/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 94655 2010-10-09 09:42:22Z tpowa $
+# $Id: PKGBUILD 104538 2011-01-03 22:13:06Z 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=163
+pkgver=165
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')
# older initscripts versions required start_udev
options=(!makeflags !libtool)
-makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
+makedepends=('glibc' 'coreutils' 'util-linux' 'pciutils' 'libusb-compat' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection')
source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2
80-drivers.rules
81-arch.rules
load-modules.sh
cdsymlinks.sh)
-md5sums=('8b584982c5548ca0368beeddc5413146'
+md5sums=('74c62aa82969278960b7ee81e94b6d8f'
'4427855146513a4703ab5c7eb8a0156e'
'f17c99779173ddc79f866cf3a5de5e68'
'f91fddc67609b45b244a624977c4247b'
@@ -27,17 +27,15 @@ md5sums=('8b584982c5548ca0368beeddc5413146'
build() {
cd $srcdir/$pkgname-$pkgver
- ./configure --prefix="" --mandir=/usr/share/man\
- --includedir=/usr/include\
- --libexecdir=/lib/udev\
- --datarootdir=/usr/share
+ ./configure --sysconfdir=/etc --with-rootlibdir=/lib --libexecdir=/lib/udev\
+ --sbindir=/sbin --with-systemdsystemunitdir=/lib/systemd/system
make
}
package_udev() {
pkgdesc="The userspace dev tools (udev)"
- depends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2'
- 'module-init-tools>=3.11')
+ depends=('glibc' 'coreutils' 'util-linux' 'libusb-compat' 'glib2'
+ 'module-init-tools>=3.11' 'pciutils')
install=udev.install
backup=(etc/udev/udev.conf
etc/modprobe.d/framebuffer_blacklist.conf)
@@ -46,11 +44,6 @@ package_udev() {
cd $srcdir/$pkgname-$pkgver
make DESTDIR=${pkgdir} install
- # Fix pkgconfig path
- install -d -m755 $pkgdir/usr/lib
- 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
@@ -107,8 +100,6 @@ package_udev() {
s#GROUP="tape"#GROUP="storage"#g;
s#GROUP="cdrom"#GROUP="optical"#g' $i
done
-
- mv "${pkgdir}/lib/girepository-1.0" "${pkgdir}/usr/lib/"
}
package_udev-compat() {
diff --git a/abs/core/udev/udev.install b/abs/core/udev/udev.install
index 2c92add..e953ec7 100644
--- a/abs/core/udev/udev.install
+++ b/abs/core/udev/udev.install
@@ -28,7 +28,7 @@ post_install() {
mknod -m644 ${ROOTDIR}/dev/null c 1 3
fi
if [ ! -c ${ROOTDIR}/dev/zero ]; then
- rm ${ROOTDIR}/dev/zero
+ rm -f ${ROOTDIR}/dev/zero
mknod -m644 ${ROOTDIR}/dev/zero c 1 5
fi
if [ -n "${ROOTDIR}" ]; then