[arch-commits] Commit in nvidia-390xx-lts/trunk (PKGBUILD)

[Jan Steffens]

    Date: Friday, October 11, 2019 @ 20:33:01
  Author: heftig
Revision: 364657

390.129-4: extramodules-lts removal

Modified:
  nvidia-390xx-lts/trunk/PKGBUILD

----------+
 PKGBUILD |   28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-11 20:32:54 UTC (rev 364656)
+++ PKGBUILD	2019-10-11 20:33:01 UTC (rev 364657)
@@ -2,26 +2,26 @@
 
 pkgname=nvidia-390xx-lts
 pkgver=390.129
-_extramodules=extramodules-lts
-pkgrel=3
+pkgrel=4
 epoch=1
+pkgdesc="NVIDIA drivers for linux-lts, 390xx legacy branch"
 arch=('x86_64')
-url="http://www.nvidia.com/"
-makedepends=("nvidia-390xx-utils=${pkgver}" 'linux-lts' 'linux-lts-headers>=4.19.78')
+url="https://www.nvidia.com/"
+makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux-lts' 'linux-lts-headers>=4.19.79')
 provides=('nvidia-390xx')
 conflicts=('nvidia-lts')
 license=('custom')
 options=('!strip')
-source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-        kernel-4.16.patch)
-sha512sums=('b6a0ecf48077dd7149b464117db4a9cd2b8ae2c0828a206f8e661fda8d42d0cce02bd132e0754e055bfeb41cbf2d047f8ffab57351d9102f161ef62adaffd6eb'
-            'ad1185d998adbf89abf7aea300e5b3bbabe2296016f42592fbc232a6c3983f233df1103d37f35a041f12cc1c722d3edce813a4a1b215784a49c7f0e3e652b5af')
-
 _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
+source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
+        'kernel-4.16.patch')
+sha256sums=('a7925a327cab828d1eb9e74f8943623c5dbc9a5e376a4c0184065d4a319696c1'
+            '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
 
 prepare() {
     sh "${_pkg}.run" --extract-only
     cd "${_pkg}"
+
     # Restore phys_to_dma support (still needed for 396.18)
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
@@ -28,22 +28,22 @@
 }
 
 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, 390xx legacy branch"
-    depends=('linux-lts>=4.19.78' "nvidia-390xx-utils=${pkgver}" 'libgl')
+    depends=('linux-lts>=4.19.79' "nvidia-390xx-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"
 }