[arch-commits] Commit in udev/trunk (PKGBUILD modprobe.nouevau.conf)

[Tom Gundersen]

    Date: Friday, February 17, 2012 @ 07:30:33
  Author: tomegun
Revision: 150409

revert to -2

Modified:
  udev/trunk/PKGBUILD
Deleted:
  udev/trunk/modprobe.nouevau.conf

-----------------------+
 PKGBUILD              |   11 +++--------
 modprobe.nouevau.conf |    7 -------
 2 files changed, 3 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-02-17 12:28:15 UTC (rev 150408)
+++ PKGBUILD	2012-02-17 12:30:33 UTC (rev 150409)
@@ -6,7 +6,7 @@
 
 pkgname=udev
 pkgver=181
-pkgrel=3
+pkgrel=2
 pkgdesc="The userspace dev tools (udev)"
 depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils')
 install=udev.install
@@ -15,8 +15,7 @@
 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
-	modprobe.nouevau.conf)
+	initcpio-install-udev)
 url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary"
 backup=(etc/udev/udev.conf)
 groups=('base')
@@ -57,14 +56,10 @@
                s#GROUP="cdrom"#GROUP="optical"#g' $i
   done
 
-  # nouveau still conflicts with some other standard kernel modules, should go away soon
-  install -D -m644 ../modprobe.nouevau.conf ${pkgdir}/lib/modprobe.d/nouveau.conf
-
   # 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'
-         '633dabda1fbfa4b6fe4dab5452b40fed')
+         'ee0bfe91a20fff12cc25ab1d1e024853')

Deleted: modprobe.nouevau.conf
===================================================================
--- modprobe.nouevau.conf	2012-02-17 12:28:15 UTC (rev 150408)
+++ modprobe.nouevau.conf	2012-02-17 12:30:33 UTC (rev 150409)
@@ -1,7 +0,0 @@
-# The following modules conflict with nouveau
-# They will probably soon be disabled from the stock kernel
-# config, and this file will go away.
-# See <http://nouveau.freedesktop.org/wiki/KernelModeSetting>
-#
-blacklist nvidiafb
-blacklist rivafb