[arch-commits] Commit in nvidia-utils/trunk (PKGBUILD nvidia-kernel-5.7.patch)

[Felix Yan]

    Date: Tuesday, June 2, 2020 @ 13:10:24
  Author: felixonmars
Revision: 388093

upgpkg: nvidia-utils 440.82-2: add patch for linux kernel 5.7

Added:
  nvidia-utils/trunk/nvidia-kernel-5.7.patch
Modified:
  nvidia-utils/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   10 +++++++---
 nvidia-kernel-5.7.patch |   22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-02 11:33:06 UTC (rev 388092)
+++ PKGBUILD	2020-06-02 13:10:24 UTC (rev 388093)
@@ -5,7 +5,7 @@
 pkgbase=nvidia-utils
 pkgname=('nvidia-utils' 'opencl-nvidia' 'nvidia-dkms')
 pkgver=440.82
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="http://www.nvidia.com/"
 license=('custom')
@@ -13,10 +13,12 @@
 _pkg="NVIDIA-Linux-x86_64-${pkgver}"
 source=('nvidia-drm-outputclass.conf'
         'nvidia-utils.sysusers'
-        "https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run")
+        "https://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
+        nvidia-kernel-5.7.patch)
 sha512sums=('de7116c09f282a27920a1382df84aa86f559e537664bb30689605177ce37dc5067748acf9afd66a3269a6e323461356592fdfc624c86523bf105ff8fe47d3770'
             '4b3ad73f5076ba90fe0b3a2e712ac9cde76f469cd8070280f960c3ce7dc502d1927f525ae18d008075c8f08ea432f7be0a6c3a7a6b49c361126dcf42f97ec499'
-            'd86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3')
+            'd86ed2cd715c5a9aebdd11ee562cfa454dbafdb1b468004cbb93d37ee258623f11144cf30b8b14996a4e093cb3119edc36d13152893d735e3536f49c45e2cca3'
+            '8b80b565e45382a25a06bebbef65760ce3a5a3de7939c5eed1d230d0e5e37c1a9e0a18825d356eb0e1c7d0f6f612619b3485e96ec23da2605eb1b449dbe9bd99')
 
 
 create_links() {
@@ -47,6 +49,8 @@
 BUILT_MODULE_NAME[3]="nvidia-drm"\
 DEST_MODULE_LOCATION[3]="/kernel/drivers/video"' dkms.conf
 
+    patch -p1 -i "$srcdir"/nvidia-kernel-5.7.patch
+
     # Gift for linux-rt guys
     sed -i 's/NV_EXCLUDE_BUILD_MODULES/IGNORE_PREEMPT_RT_PRESENCE=1 NV_EXCLUDE_BUILD_MODULES/' dkms.conf
 }

Added: nvidia-kernel-5.7.patch
===================================================================
--- nvidia-kernel-5.7.patch	                        (rev 0)
+++ nvidia-kernel-5.7.patch	2020-06-02 13:10:24 UTC (rev 388093)
@@ -0,0 +1,22 @@
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 8f807a1..af29636 100755
+--- a/conftest.sh
++++ b/conftest.sh
+@@ -143,6 +143,7 @@ test_headers() {
+     FILES="$FILES video/nv_internal.h"
+     FILES="$FILES asm/book3s/64/hash-64k.h"
+     FILES="$FILES asm/set_memory.h"
++    FILES="$FILES asm/pgtable.h"
+     FILES="$FILES asm/prom.h"
+     FILES="$FILES asm/powernv.h"
+     FILES="$FILES asm/tlbflush.h"
+@@ -466,6 +467,9 @@ compile_test() {
+             # It does not exist on all architectures.
+             #
+             CODE="
++            #if defined(NV_ASM_PGTABLE_H_PRESENT)
++            #include <asm/pgtable.h>
++            #endif
+             #if defined(NV_ASM_SET_MEMORY_H_PRESENT)
+             #include <asm/set_memory.h>
+             #else