[arch-commits] Commit in nvidia-304xx-lts/repos (4 files)

[Andreas Radke]

    Date: Thursday, December 14, 2017 @ 19:26:50
  Author: andyrtr
Revision: 312668

archrelease: copy trunk to testing-x86_64

Added:
  nvidia-304xx-lts/repos/testing-x86_64/
  nvidia-304xx-lts/repos/testing-x86_64/PKGBUILD
    (from rev 312667, nvidia-304xx-lts/trunk/PKGBUILD)
  nvidia-304xx-lts/repos/testing-x86_64/disable-mtrr.patch
    (from rev 312667, nvidia-304xx-lts/trunk/disable-mtrr.patch)
  nvidia-304xx-lts/repos/testing-x86_64/nvidia-304xx-lts.install
    (from rev 312667, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)

--------------------------+
 PKGBUILD                 |   54 +++++++++++++++++++++++++++++++++++++++++++++
 disable-mtrr.patch       |   24 ++++++++++++++++++++
 nvidia-304xx-lts.install |   15 ++++++++++++
 3 files changed, 93 insertions(+)

Copied: nvidia-304xx-lts/repos/testing-x86_64/PKGBUILD (from rev 312667, nvidia-304xx-lts/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2017-12-14 19:26:50 UTC (rev 312668)
@@ -0,0 +1,54 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgname=nvidia-304xx-lts
+pkgver=304.137
+_extramodules=extramodules-4.9-lts
+pkgrel=6
+pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
+arch=('x86_64')
+url="http://www.nvidia.com/"
+depends=('linux-lts>=4.9.69' "nvidia-304xx-utils=${pkgver}")
+makedepends=('linux-lts-headers>=4.9.69')
+conflicts=('nvidia-lts' 'nvidia-96xx-lts' 'nvidia-173xx-lts')
+provides=('nvidia-304xx')
+license=('custom')
+install=nvidia-304xx-lts.install
+options=('!strip')
+source=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
+        "http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
+        disable-mtrr.patch)
+sha512sums=('021c5a88d50489aa0a1c7eac14259e23542b93578ae339995a2e38b786d06d239968c07933cab3fb78a922cffc7e213d6fa3fe07e34065a9c7f03e24f8729370'
+            '4ab648647e4f3e2c352b2eab6454c264fe4728d8eb1264fafee2a4ab1a4ce59516abcf8490044d31e35309ea951e564cc217e13f7139a48bbf650a4238c5b87c'
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+
+
+  _arch='x86_64'
+  _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
+
+prepare() {
+    cd "${srcdir}"
+    sh "${_pkg}.run" --extract-only
+    cd "${_pkg}"
+    # patches here
+
+    # FS#47092
+    #(cd kernel; patch -p1 --no-backup-if-mismatch -i "$srcdir"/disable-mtrr.patch)
+}
+
+build() {
+    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
+    cd "${_pkg}/kernel"
+    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 -m755 "${pkgdir}/usr/lib/modprobe.d"
+    echo "blacklist nouveau" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
+    echo "blacklist nvidiafb" >> "${pkgdir}/usr/lib/modprobe.d/nvidia-304xx-lts.conf"
+    gzip "${pkgdir}/usr/lib/modules/${_extramodules}/nvidia.ko"
+    install -D -m644 ${_pkg}/LICENSE "${pkgdir}/usr/share/licenses/nvidia-304xx-lts/LICENSE"
+}

Copied: nvidia-304xx-lts/repos/testing-x86_64/disable-mtrr.patch (from rev 312667, nvidia-304xx-lts/trunk/disable-mtrr.patch)
===================================================================
--- testing-x86_64/disable-mtrr.patch	                        (rev 0)
+++ testing-x86_64/disable-mtrr.patch	2017-12-14 19:26:50 UTC (rev 312668)
@@ -0,0 +1,24 @@
+Author: Luca Boccassi <luca.boccassi at gmail.com>
+Description: Disable MTRR on kernel >= 4.3
+ From kernel 4.3 and newer (commit 2baa891e42d84) mtrr_add and mtrr_del are no
+ longer exported. The Nvidia kernel shim still uses it as of 304.131, causing
+ the module to error out when loading. Disable MTRR if running on 4.3 or greater
+ until upstream fixes it.
+--- a/nv-linux.h
++++ b/nv-linux.h
+@@ -256,6 +256,15 @@
+ #include <linux/seq_file.h>
+ #endif
+ 
++/*
++ * As of version 304.131, os-agp.c and os-mtrr.c still use deprecated
++ * kernel APIs for mtrr which are no longer exported since 4.3, causing
++ * the module to error out when loaded.
++ */
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)
++#undef CONFIG_MTRR
++#endif
++
+ #if !defined(NV_VMWARE) && defined(CONFIG_MTRR)
+ #include <asm/mtrr.h>
+ #endif

Copied: nvidia-304xx-lts/repos/testing-x86_64/nvidia-304xx-lts.install (from rev 312667, nvidia-304xx-lts/trunk/nvidia-304xx-lts.install)
===================================================================
--- testing-x86_64/nvidia-304xx-lts.install	                        (rev 0)
+++ testing-x86_64/nvidia-304xx-lts.install	2017-12-14 19:26:50 UTC (rev 312668)
@@ -0,0 +1,15 @@
+post_install() {
+    EXTRAMODULES='extramodules-4.9-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    echo 'In order to use nvidia module, reboot the system.'
+}
+
+post_upgrade() {
+    EXTRAMODULES='extramodules-4.9-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_remove() {
+    EXTRAMODULES='extramodules-4.9-lts'
+    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}