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

[Thomas Bächler]

    Date: Tuesday, October 25, 2011 @ 14:37:14
  Author: thomas
Revision: 141186

upgpkg: nvidia 285.05.09-3

Fix depmod on upgrade

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-10-25 18:22:04 UTC (rev 141185)
+++ PKGBUILD	2011-10-25 18:37:14 UTC (rev 141186)
@@ -5,7 +5,7 @@
 pkgver=285.05.09
 _extramodules=extramodules-3.1-ARCH
 _kernver="$(cat /lib/modules/${_extramodules}/version)"
-pkgrel=2
+pkgrel=3
 pkgdesc="NVIDIA drivers for linux."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -40,6 +40,6 @@
         "${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"
+    sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
     gzip "${pkgdir}/lib/modules/${_extramodules}/nvidia.ko"
 }

Modified: nvidia.install
===================================================================
--- nvidia.install	2011-10-25 18:22:04 UTC (rev 141185)
+++ nvidia.install	2011-10-25 18:37:14 UTC (rev 141186)
@@ -1,16 +1,16 @@
 post_install() {
-    KERNEL_VERSION='3.1.0-1-ARCH'
-    depmod $KERNEL_VERSION
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    KERNEL_VERSION='3.1.0-1-ARCH'
-    depmod $KERNEL_VERSION
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
     rmmod nvidia || echo 'In order to use the new nvidia module, exit Xserver and unload it manually.'
 }
 
 post_remove() {
-    KERNEL_VERSION='3.1.0-1-ARCH'
-    depmod $KERNEL_VERSION
+    EXTRAMODULES='extramodules-3.1-ARCH'
+    depmod $(cat /lib/modules/$EXTRAMODULES/version)
 }