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

[Tobias Powalowski]

    Date: Tuesday, October 25, 2011 @ 09:40:06
  Author: tpowa
Revision: 141179

upgpkg: nvidia 285.05.09-2

rebuild against 3.1 series

Modified:
  nvidia/trunk/PKGBUILD
  nvidia/trunk/nvidia.install

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-25 13:33:10 UTC (rev 141178)
+++ PKGBUILD	2011-10-25 13:40:06 UTC (rev 141179)
@@ -3,13 +3,14 @@
 
 pkgname=nvidia
 pkgver=285.05.09
-_kernver='3.0-ARCH'
-pkgrel=1
+_extramodules=extramodules-3.1-ARCH
+_kernver="$(cat /lib/modules/${_extramodules}/version)"
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux>=3.0' 'linux<3.1' "nvidia-utils=${pkgver}")
-makedepends=('linux-headers>=3.0' 'linux-headers<3.1')
+depends=('linux>=3.1' 'linux<3.2' "nvidia-utils=${pkgver}")
+makedepends=('linux-headers>=3.1' 'linux-headers<3.2')
 conflicts=('nvidia-96xx' 'nvidia-173xx')
 license=('custom')
 install=nvidia.install
@@ -36,9 +37,9 @@
 
 package() {
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
-        "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
+        "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
     install -d -m755 "${pkgdir}/etc/modprobe.d"
     echo "blacklist nouveau" >> "${pkgdir}/etc/modprobe.d/nouveau_blacklist.conf"
     sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/lib/modules/${_kernver}/kernel/drivers/video/nvidia.ko"
+    gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
 }

Modified: nvidia.install
===================================================================
--- nvidia.install	2011-10-25 13:33:10 UTC (rev 141178)
+++ nvidia.install	2011-10-25 13:40:06 UTC (rev 141179)
@@ -1,16 +1,16 @@
 post_install() {
-    KERNEL_VERSION='3.0-ARCH'
+    KERNEL_VERSION='3.1.0-1-ARCH'
     depmod $KERNEL_VERSION
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    KERNEL_VERSION='3.0-ARCH'
+    KERNEL_VERSION='3.1.0-1-ARCH'
     depmod $KERNEL_VERSION
     rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-    KERNEL_VERSION='3.0-ARCH'
+    KERNEL_VERSION='3.1.0-1-ARCH'
     depmod $KERNEL_VERSION
 }