diff options
author | vnctdj | 2023-07-07 00:28:55 +0200 |
---|---|---|
committer | vnctdj | 2023-07-07 00:28:55 +0200 |
commit | 88f2fede7ec004381b3d4a5e003fb65ff8339068 (patch) | |
tree | 4eb09e4ae57e2893094943a10bdeaceb46565b81 | |
parent | 3d0a6fd5ef814874675b1a2fec551c40342b3331 (diff) | |
download | aur-88f2fede7ec004381b3d4a5e003fb65ff8339068.tar.gz |
Change kernel-6.3.patch files path
PKGBUILD is easier to read now that we have to keep several patches, and we avoid potential dumb errors.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | kernel-6.3.patch | 24 |
3 files changed, 17 insertions, 17 deletions
@@ -17,7 +17,7 @@ pkgbase = nvidia-390xx-utils b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534 b2sums = 44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b b2sums = dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2 - b2sums = 6c9a4cf14d5987b688da1aade433a8e96dc530264aac8ec6016a2118ca6fef18f4e4b8519c506d81848a1a809ec52d8a1fc89385be15f7c202342a4cdcf082a7 + b2sums = 09f674b2bd55d40df072b70598b78d6a4e57f80a974f99d39b9cd95e0e20cd5698b9b48671b5cb85fcda780d4badc84c8caa5104d2a5c5f85b37841109101701 b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05 pkgname = nvidia-390xx-utils @@ -26,7 +26,7 @@ b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1 '67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534' '44b855cd11f3b2f231f9fb90492ae2e67a67ea3ea83c413e7c90956d38c9730a8bd0321281ae03c6afce633d102f5b499aed25622b9bfd31bdd2c98f0717e95b' 'dd1153903badbb9c2401c583a983ce5a413da2afffa6dd3ef6e839933a1c994518d5bfbcaf6800496e0d40785a4e7eb0770c8a739fe231ad3085c541bcb3f2b2' - '6c9a4cf14d5987b688da1aade433a8e96dc530264aac8ec6016a2118ca6fef18f4e4b8519c506d81848a1a809ec52d8a1fc89385be15f7c202342a4cdcf082a7' + '09f674b2bd55d40df072b70598b78d6a4e57f80a974f99d39b9cd95e0e20cd5698b9b48671b5cb85fcda780d4badc84c8caa5104d2a5c5f85b37841109101701' 'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05') create_links() { @@ -53,10 +53,10 @@ prepare() { # From Joan Bruguera via Ike Devolder patch -Np1 -i ../kernel-6.2.patch - cd kernel - # From Ike Devolder - patch -Np1 -i ../../kernel-6.3.patch + patch -Np1 -i ../kernel-6.3.patch + + cd kernel sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf sed -i 's/__JOBS/`nproc`/' dkms.conf diff --git a/kernel-6.3.patch b/kernel-6.3.patch index f062e780d7a6..392719519d69 100644 --- a/kernel-6.3.patch +++ b/kernel-6.3.patch @@ -1,7 +1,7 @@ -diff --git a/common/inc/nv-linux.h b/common/inc/nv-linux.h +diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h index 2c4cb7b..f68fcf2 100644 ---- a/common/inc/nv-linux.h -+++ b/common/inc/nv-linux.h +--- a/kernel/common/inc/nv-linux.h ++++ b/kernel/common/inc/nv-linux.h @@ -1996,4 +1996,17 @@ static inline NvU64 nv_expand_nvlink_addr(NvU64 addr47) #include <linux/backlight.h> #endif @@ -20,10 +20,10 @@ index 2c4cb7b..f68fcf2 100644 +#endif + #endif /* _NV_LINUX_H_ */ -diff --git a/nvidia-drm/nvidia-drm-fb.c b/nvidia-drm/nvidia-drm-fb.c +diff --git a/kernel/nvidia-drm/nvidia-drm-fb.c b/kernel/nvidia-drm/nvidia-drm-fb.c index 725164a..c35e0ee 100644 ---- a/nvidia-drm/nvidia-drm-fb.c -+++ b/nvidia-drm/nvidia-drm-fb.c +--- a/kernel/nvidia-drm/nvidia-drm-fb.c ++++ b/kernel/nvidia-drm/nvidia-drm-fb.c @@ -29,6 +29,7 @@ #include "nvidia-drm-fb.h" #include "nvidia-drm-utils.h" @@ -32,10 +32,10 @@ index 725164a..c35e0ee 100644 #include <drm/drm_crtc_helper.h> -diff --git a/nvidia-uvm/uvm8.c b/nvidia-uvm/uvm8.c +diff --git a/kernel/nvidia-uvm/uvm8.c b/kernel/nvidia-uvm/uvm8.c index 11cb373..49e1047 100644 ---- a/nvidia-uvm/uvm8.c -+++ b/nvidia-uvm/uvm8.c +--- a/kernel/nvidia-uvm/uvm8.c ++++ b/kernel/nvidia-uvm/uvm8.c @@ -658,7 +658,7 @@ static int uvm_mmap(struct file *filp, struct vm_area_struct *vma) // Using VM_DONTCOPY would be nice, but madvise(MADV_DOFORK) can reset that // so we have to handle vm_open on fork anyway. We could disable MADV_DOFORK @@ -45,10 +45,10 @@ index 11cb373..49e1047 100644 vma->vm_ops = &uvm_vm_ops_managed; -diff --git a/nvidia/nv-mmap.c b/nvidia/nv-mmap.c +diff --git a/kernel/nvidia/nv-mmap.c b/kernel/nvidia/nv-mmap.c index 0b0a6f2..da891ff 100644 ---- a/nvidia/nv-mmap.c -+++ b/nvidia/nv-mmap.c +--- a/kernel/nvidia/nv-mmap.c ++++ b/kernel/nvidia/nv-mmap.c @@ -447,7 +447,7 @@ int nvidia_mmap_helper( addr = mmap_start; |