[arch-commits] Commit in nvidia-96xx/trunk (PKGBUILD nvidia.install)

[Tobias Powalowski]

    Date: Monday, May 17, 2010 @ 04:27:25
  Author: tpowa
Revision: 80426

upgpkg: nvidia-96xx 96.43.16-3
rebuild  against .34 series

Modified:
  nvidia-96xx/trunk/PKGBUILD
  nvidia-96xx/trunk/nvidia.install

----------------+
 PKGBUILD       |   10 ++++++----
 nvidia.install |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-05-17 08:25:56 UTC (rev 80425)
+++ PKGBUILD	2010-05-17 08:27:25 UTC (rev 80426)
@@ -3,15 +3,15 @@
 
 pkgname=nvidia-96xx
 pkgver=96.43.16
-_kernver='2.6.33-ARCH'
-pkgrel=2
+_kernver='2.6.34-ARCH'
+pkgrel=3
 pkgdesc="NVIDIA drivers for kernel26, 96xx branch."
 arch=('i686' 'x86_64')
 [ "$CARCH" = "i686"   ] && ARCH=x86
 [ "$CARCH" = "x86_64" ] && ARCH=x86_64
 url="http://www.nvidia.com/"
-depends=('kernel26>=2.6.33' 'kernel26<2.6.34' 'nvidia-96xx-utils')
-makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34')
+depends=('kernel26>=2.6.34' 'kernel26<2.6.35' 'nvidia-96xx-utils')
+makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35')
 conflicts=('nvidia' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
@@ -30,5 +30,7 @@
 	mkdir -p $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
 	install -m644 nvidia.ko $pkgdir/lib/modules/${_kernver}/kernel/drivers/video/
 
+        mkdir -p $pkgdir/etc/modprobe.d
+        echo "blacklist nouveau" >> $pkgdir/etc/modprobe.d/nouveau_blacklist.conf || return 1
 	sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/nvidia.install
 }

Modified: nvidia.install
===================================================================
--- nvidia.install	2010-05-17 08:25:56 UTC (rev 80425)
+++ nvidia.install	2010-05-17 08:27:25 UTC (rev 80426)
@@ -1,5 +1,5 @@
 post_install() {
-	KERNEL_VERSION='2.6.33-ARCH'
+	KERNEL_VERSION='2.6.34-ARCH'
 	depmod $KERNEL_VERSION
 }
 
@@ -9,6 +9,6 @@
 }
 
 post_remove() {
-	KERNEL_VERSION='2.6.33-ARCH'
+	KERNEL_VERSION='2.6.34-ARCH'
 	depmod $KERNEL_VERSION
 }