Update to 390.129-11

2 files changed, 65 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 566fe956b711..85c1e9333864 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = nvidia-390xx-ck
 	pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch.
 	pkgver = 390.129
-	pkgrel = 10
+	pkgrel = 11
 	url = https://www.nvidia.com/
 	arch = x86_64
 	license = custom
 	makedepends = nvidia-390xx-utils=390.129
 	makedepends = libglvnd
+	makedepends = linux-ck
 	makedepends = linux-ck-headers
-	depends = linux-ck
-	depends = libglvnd
-	depends = nvidia-390xx-utils=390.129
-	conflicts = nvidia-340xx-ck
-	conflicts = nvidia-ck
+	conflicts = nvidia
 	options = !strip
 	source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.129/NVIDIA-Linux-x86_64-390.129-no-compat32.run
 	source = kernel-4.16.patch
@@ -20,4 +17,18 @@ pkgbase = nvidia-390xx-ck
 	sha256sums = 622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385
 
 pkgname = nvidia-390xx-ck
+	pkgdesc = NVIDIA drivers for linux-ck, 390xx legacy branch.
+	depends = linux-ck
+	depends = nvidia-390xx-utils=390.129
+	depends = libglvnd
+
+pkgname = nvidia-390xx-ck-dkms
+	pkgdesc = NVIDIA driver sources for linux-ck, 390xx legacy branch
+	depends = dkms
+	depends = nvidia-390xx-utils=390.129
+	depends = libglvnd
+	optdepends = linux-ck-headers: Build the module for ck kernel
+	provides = nvidia-390xx=390.129
+	conflicts = nvidia
+	conflicts = nvidia-390xx
 
diff --git a/PKGBUILD b/PKGBUILD
index 2188911c0317..25981d0347ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,27 @@
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contrubutor: Thomas Baechler <thomas@archlinux.org>
 
-pkgname=nvidia-390xx-ck
+pkgbase=nvidia-390xx-ck
+pkgname=(nvidia-390xx-ck nvidia-390xx-ck-dkms)
 pkgver=390.129
-pkgrel=10
-_pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch."
-pkgdesc="$_pkgdesc"
+pkgrel=11
+pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch."
 arch=('x86_64')
 url="https://www.nvidia.com/"
-makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux-ck-headers')
-depends=('linux-ck' 'libglvnd' "nvidia-390xx-utils=${pkgver}")
-conflicts=('nvidia-340xx-ck' 'nvidia-ck')
-#groups=('ck-generic')
-#replaces=()
+makedepends=("nvidia-390xx-utils=${pkgver}" 'libglvnd' 'linux-ck' 'linux-ck-headers')
+conflicts=('nvidia')
 license=('custom')
 options=('!strip')
+_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
 source=("https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run"
-'kernel-4.16.patch')
+  'kernel-4.16.patch')
 sha256sums=('a7925a327cab828d1eb9e74f8943623c5dbc9a5e376a4c0184065d4a319696c1'
             '622ac792ec200b2239cb663c0010392118b78c9904973d82cd261165c16d6385')
 
-_pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
-
 # default is 'linux' substitute custom name here
 _kernelname=linux-ck
 _kernver="$(</usr/src/$_kernelname/version)"
+_extradir="/usr/lib/modules/$_kernver/extramodules"
 
 prepare() {
     sh "${_pkg}.run" --extract-only
@@ -34,6 +31,23 @@ prepare() {
     # Restore phys_to_dma support (still needed for 396.18)
     # https://bugs.archlinux.org/task/58074
     patch -Np1 -i ../kernel-4.16.patch
+
+    cp -a kernel kernel-dkms
+    cd kernel-dkms
+    sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
+    sed -i 's/__JOBS/`nproc`/' dkms.conf
+    sed -i 's/__DKMS_MODULES//' dkms.conf
+    sed -i '$iBUILT_MODULE_NAME[0]="nvidia"\
+DEST_MODULE_LOCATION[0]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[1]="nvidia-uvm"\
+DEST_MODULE_LOCATION[1]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[2]="nvidia-modeset"\
+DEST_MODULE_LOCATION[2]="/kernel/drivers/video"\
+BUILT_MODULE_NAME[3]="nvidia-drm"\
+DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
+
+    # Gift for linux-rt guys
+    sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf
 }
 
 build() {
@@ -41,8 +55,10 @@ build() {
   make SYSSRC="/usr/src/$_kernelname" module
 }
 
-package() {
-  _extradir="/usr/lib/modules/$_kernver/extramodules"
+package_nvidia-390xx-ck() {
+  pkgdesc="NVIDIA drivers for linux-ck, 390xx legacy branch."
+  depends=('linux-ck' "nvidia-390xx-utils=${pkgver}" 'libglvnd')
+
   install -Dt "${pkgdir}${_extradir}" -m644 \
     "${srcdir}/${_pkg}/kernel"/nvidia{,-modeset,-drm,-uvm}.ko
 
@@ -54,4 +70,22 @@ package() {
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
 }
 
+package_nvidia-390xx-ck-dkms() {
+    pkgdesc="NVIDIA driver sources for linux-ck, 390xx legacy branch"
+    depends=('dkms' "nvidia-390xx-utils=$pkgver" 'libglvnd')
+    optdepends=('linux-ck-headers: Build the module for ck kernel')
+    provides=("nvidia-390xx=$pkgver")
+    conflicts+=('nvidia-390xx')
+
+    cd "${_pkg}"
+
+    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/${pkgname}.conf"
+
+    install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 "${srcdir}/${_pkg}/LICENSE"
+}
+
 # vim:set ts=2 sw=2 et: