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

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Wed Mar 5 02:11:52 UTC 2014


    Date: Wednesday, March 5, 2014 @ 03:11:52
  Author: svenstaro
Revision: 206685

upgpkg: nvidia 334.21-2

Fix FS#39167 and FS#39141

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

----------------+
 PKGBUILD       |   12 ++++++++----
 nvidia.install |    6 +++---
 2 files changed, 11 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-04 22:49:29 UTC (rev 206684)
+++ PKGBUILD	2014-03-05 02:11:52 UTC (rev 206685)
@@ -4,7 +4,7 @@
 pkgname=nvidia
 pkgver=334.21
 _extramodules=extramodules-3.13-ARCH
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA drivers for linux"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -23,7 +23,6 @@
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 
 prepare() {
-    cd "${srcdir}"
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
     # patches here
@@ -31,15 +30,20 @@
 
 build() {
     _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-    cd "${srcdir}"/"${_pkg}"/kernel
+    cd "${_pkg}"/kernel
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+
+    cd uvm
+    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }
 
 package() {
     install -D -m644 "${srcdir}/${_pkg}/kernel/nvidia.ko" \
         "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 "${srcdir}/${_pkg}/kernel/uvm/nvidia-uvm.ko" \
+        "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia-uvm.ko"
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/"*.ko
     install -d -m755 "${pkgdir}/usr/lib/modprobe.d"
     echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
     sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/nvidia.install"
-    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
 }

Modified: nvidia.install
===================================================================
--- nvidia.install	2014-03-04 22:49:29 UTC (rev 206684)
+++ nvidia.install	2014-03-05 02:11:52 UTC (rev 206685)
@@ -1,11 +1,11 @@
 post_install() {
-    EXTRAMODULES='extramodules-3.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use nvidia module, reboot the system.'
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     if  [ "$(vercmp $2 310.19-2)" -lt 0 ]; then
         echo 'If your card is from the 7xxx series or earlier, install nvidia-304xx'
@@ -13,6 +13,6 @@
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.12-ARCH'
+    EXTRAMODULES='extramodules-3.13-ARCH'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }




More information about the arch-commits mailing list