Mon Feb 13 23:15:14 UTC 2012

1 files changed, 24 insertions, 61 deletions

diff --git a/core/udev/PKGBUILD b/core/udev/PKGBUILD
index 7b3d060c2..8e4448343 100644
--- a/core/udev/PKGBUILD
+++ b/core/udev/PKGBUILD
@@ -1,30 +1,33 @@
-# $Id: PKGBUILD 148430 2012-01-31 19:55:52Z tomegun $
+# $Id: PKGBUILD 150105 2012-02-12 15:37:11Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 
-pkgbase="udev"
-pkgname=('udev' 'udev-compat')
-pkgver=180
-pkgrel=1
+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)
-url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
 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)
-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
+  cd $srcdir/$pkgname-$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
@@ -32,30 +35,19 @@ build() {
   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
+package() {
+  cd $srcdir/$pkgname-$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
+  # 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}/sbin/udevd
+  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
@@ -63,40 +55,11 @@ package_udev() {
                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
-  
+  # 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=('1cf124ab5a124ea35d4748ea414926ec')
+md5sums=('0d7af750702620a871b9f9b98d8ad859'
+         'a4dd853050bf2e0ae6b2e3d2c75499c2'
+         'ee0bfe91a20fff12cc25ab1d1e024853')