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

[Jan Steffens]

    Date: Thursday, February 15, 2018 @ 01:48:56
  Author: heftig
Revision: 317080

390.25-11: kernel 4.15.3-2

Modified:
  nvidia/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-02-15 01:44:42 UTC (rev 317079)
+++ PKGBUILD	2018-02-15 01:48:56 UTC (rev 317080)
@@ -7,7 +7,7 @@
 pkgname=(nvidia nvidia-dkms)
 pkgver=390.25
 _extramodules=extramodules-4.15-ARCH
-pkgrel=10
+pkgrel=11
 pkgdesc="NVIDIA drivers for linux"
 arch=('x86_64')
 url="http://www.nvidia.com/"
@@ -60,8 +60,11 @@
 
     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" <<END
+blacklist nouveau
+blacklist nvidiafb
+blacklist rivafb
+END
 
     install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
 }
@@ -78,8 +81,11 @@
     install -dm 755 "${pkgdir}"/usr/src
     cp -dr --no-preserve='ownership' kernel-dkms "${pkgdir}/usr/src/nvidia-${pkgver}"
 
-    echo "blacklist nouveau" |
-    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/nvidia.conf"
+    install -Dm644 /dev/stdin "${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf" <<END
+blacklist nouveau
+blacklist nvidiafb
+blacklist rivafb
+END
 
     install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
 }