[arch-commits] Commit in nvidia-304xx-lts/trunk (PKGBUILD disable-mtrr.patch)

[Andreas Radke]

    Date: Monday, April 18, 2016 @ 18:17:58
  Author: andyrtr
Revision: 265139

upgpkg: nvidia-304xx-lts 304.131-6

fix FS#48988 - Unknown symbol mtrr_del

Added:
  nvidia-304xx-lts/trunk/disable-mtrr.patch
Modified:
  nvidia-304xx-lts/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   29 +++++++++++++++++++++++------
 disable-mtrr.patch |   24 ++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-04-18 16:02:12 UTC (rev 265138)
+++ PKGBUILD	2016-04-18 16:17:58 UTC (rev 265139)
@@ -5,7 +5,7 @@
 pkgname=nvidia-304xx-lts
 pkgver=304.131
 _extramodules=extramodules-4.4-lts
-pkgrel=5
+pkgrel=6
 pkgdesc="NVIDIA drivers for linux-lts, 304xx legacy branch"
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
@@ -16,11 +16,19 @@
 license=('custom')
 install=nvidia-304xx-lts.install
 options=('!strip')
-source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
-source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
-sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
+#source_i686=("http://us.download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run")
+#source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
+#sha512sums_i686=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e')
+#sha512sums_x86_64=('07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93')
 
+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=('3e67c40648554dc49472081eee88ae982c3b235b3346e4d9e7fb5ae33ec5f10ed088da804ac7d8bd1565995df3861f12b3560030cd3a19339a2d35768b0a943e'
+            '07e529e4e81c42b43861475029aa0f223f8f3d299be9ddfe820c583e26aae49223a9b0dfee6d66ab09c526554bb581e5f8cf755eda600cb9e0bdac7d5f4acb93'
+            '54e8825e523f11706890e09e476498f3a30f75ce4e350ff2ff8a1e1c3af574d9ccfb8903543766b6863d94cdfbf46e68cd3d33380867dd976cafc8dd2dd78774')
+
+
 if [ "$CARCH" = "i686" ]; then
   _arch='x86'
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}"
@@ -29,9 +37,18 @@
   _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32"
 fi
 
+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)"
-    sh "${_pkg}.run" --extract-only
     cd "${_pkg}/kernel"
     make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
 }

Added: disable-mtrr.patch
===================================================================
--- disable-mtrr.patch	                        (rev 0)
+++ disable-mtrr.patch	2016-04-18 16:17:58 UTC (rev 265139)
@@ -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