[arch-commits] Commit in nvidia-lts/trunk (PKGBUILD fs62142.patch)

[Jan Steffens]

    Date: Friday, October 11, 2019 @ 20:32:54
  Author: heftig
Revision: 364656

435.21-5: extramodules-lts removal

Added:
  nvidia-lts/trunk/fs62142.patch
Modified:
  nvidia-lts/trunk/PKGBUILD

---------------+
 PKGBUILD      |   28 ++++++++++++++++------------
 fs62142.patch |   13 +++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-11 20:23:36 UTC (rev 364655)
+++ PKGBUILD	2019-10-11 20:32:54 UTC (rev 364656)
@@ -2,41 +2,45 @@
 
 pkgname=nvidia-lts
 pkgver=435.21
-_extramodules=extramodules-lts
-pkgrel=4
+pkgrel=5
 epoch=1
+pkgdesc="NVIDIA drivers for linux-lts"
 arch=('x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-utils=${pkgver}" 'linux-lts' 'linux-lts-headers>=4.19.78')
+url="https://www.nvidia.com/"
+makedepends=("nvidia-utils=${pkgver}" 'libglvnd' 'linux-lts' 'linux-lts-headers>=4.19.79')
 provides=('nvidia')
 license=('custom')
 options=('!strip')
 _pkg="NVIDIA-Linux-x86_64-${pkgver}"
-source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
-sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270')
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
+        fs62142.patch)
+sha512sums=('e83b6dff80434971c0b254815945d485a45c978b8a19994244f50a463658863948b2eac8bc62d667bb10c23f41cf1c3521c409d23ac2ab6a0c0cd094a6e20270'
+            'df949debf9fed92b3c58322c02685fb344bbfff2920557e7d55ed3f70559f48cd6199bc85e2af170b7e56797f3e9881a53eab8c411f21e75f5abec26eaa47752')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
+
+    # Fix https://bugs.archlinux.org/task/62142
+    patch -Np1 -i ../fs62142.patch
 }
 
 build() {
-    _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
     cd "${_pkg}"/kernel
-    make SYSSRC=/usr/lib/modules/"${_kernver}/build" module
+    make SYSSRC=/usr/src/linux-lts module
 }
 
 package() {
-    pkgdesc="NVIDIA drivers for linux-lts"
-    depends=('linux-lts>=4.19.78' "nvidia-utils=${pkgver}" 'libgl')
+    depends=('linux-lts>=4.19.79' "nvidia-utils=${pkgver}" 'libglvnd')
 
-    install -Dt "${pkgdir}/usr/lib/modules/${_extramodules}" -m644 \
+    _extradir="/usr/lib/modules/$(</usr/src/linux-lts/version)/extramodules"
+    install -Dt "${pkgdir}${_extradir}" -m644 \
       "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
 
     find "${pkgdir}" -name '*.ko' -exec gzip -n {} +
 
     echo "blacklist nouveau" |
-      install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
+        install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf"
 
     install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
 }

Added: fs62142.patch
===================================================================
--- fs62142.patch	                        (rev 0)
+++ fs62142.patch	2019-10-11 20:32:54 UTC (rev 364656)
@@ -0,0 +1,13 @@
+diff --git a/kernel/nvidia/nv-dma.c b/kernel/nvidia/nv-dma.c
+index 73cdeed..e691014 100644
+--- a/kernel/nvidia/nv-dma.c
++++ b/kernel/nvidia/nv-dma.c
+@@ -606,7 +606,7 @@ static NvBool nv_dma_is_map_resource_implemented
+ #if defined(NV_DMA_MAP_RESOURCE_PRESENT)
+     const struct dma_map_ops *ops = get_dma_ops(&nvl->dev->dev);
+ 
+-    return (ops->map_resource != NULL);
++    return (ops && ops->map_resource);
+ #else
+     return NV_FALSE;
+ #endif