mirror/aur
1
0
Fork 0
mirror of https://github.com/archlinux/aur.git synced 2026-03-14 23:16:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

kernel-5.17.patch from Joan Bruguera via Ike Devolder

Browse source
This commit is contained in:
Jonathon Fernyhough 2022-03-27 14:11:35 +01:00
parent b2317a0dc6
commit df6f2e7fd7
No known key found for this signature in database
GPG key ID: 9C08A255442FAFF0
3 changed files with 45 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.SRCINFO
View file

@ -1,6 +1,6 @@
pkgbase = nvidia-390xx-utils
pkgver = 390.147
pkgrel = 1
pkgrel = 2
url = https://www.nvidia.com/
arch = x86_64
license = custom
@ -9,11 +9,13 @@ pkgbase = nvidia-390xx-utils
source = nvidia-390xx-utils.sysusers
source = nvidia-390xx.rules
source = https://us.download.nvidia.com/XFree86/Linux-x86_64/390.147/NVIDIA-Linux-x86_64-390.147.run
source = kernel-5.17.patch
source = kernel-4.16.patch
b2sums = 8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9
b2sums = c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be
b2sums = 67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534
b2sums = a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc
b2sums = 308c4e770500dc63031a5736bf9578982c022b91c4ef081545821322c1712a8fc3ceab70d507b329378eee053671e8a89c59d9787821f25e92aadf4161f761a6
b2sums = a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05
pkgname = nvidia-390xx-utils

8
PKGBUILD
View file

@ -7,7 +7,7 @@
pkgbase=nvidia-390xx-utils
pkgname=('nvidia-390xx-utils' 'opencl-nvidia-390xx' 'nvidia-390xx-dkms')
pkgver=390.147
pkgrel=1
pkgrel=2
arch=('x86_64')
url="https://www.nvidia.com/"
license=('custom')
@ -17,11 +17,13 @@ source=('nvidia-drm-outputclass.conf'
'nvidia-390xx-utils.sysusers'
'nvidia-390xx.rules'
"https://us.download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/${_pkg}.run"
kernel-5.17.patch
kernel-4.16.patch)
b2sums=('8e24aea70b139185bd682b080d32aeda673e6e92b45a90e6f6e0d736674180400bc8bd1aa5c66b8d033fc9d5e0cfffed456a87298bd93a3afbbc30b8dc48c4e9'
'c1da4ce5784e43385465913a95053a3e54f800aac6f1b49f33e2a77504d76da5e6db6ec7074fbe7ba5f52dcef9e1ebaa620942c33ff825a56caba5c9c8b0d1be'
'67e32932eeddda8fef667d25c34faf7b3a02f01cf9c15a97e5613bd44a0e8dcf7396e25399a52701f55dd18054c689720f237bb07d5bd580394d8dc8c9d05534'
'a8085c9abc1c31251788a8f5abdc2090c9085b3028e364184244bbf24d822dc3266877c88b30f403507fa2dd511c68ec67e1f188d6b0f1f4d7d792881d5253fc'
'308c4e770500dc63031a5736bf9578982c022b91c4ef081545821322c1712a8fc3ceab70d507b329378eee053671e8a89c59d9787821f25e92aadf4161f761a6'
'a8234f542c2324ad698443e3decf7b6eacf3cb420b7aded787f102a8d32b64c2a8d45ea58e37a5e3b6f2f060f0cccd63d3a182065f57c606006d0ff8c7f6bb05')
create_links() {
@ -45,6 +47,10 @@ prepare() {
# From loqs via https://bugs.archlinux.org/task/58074
patch -Np1 -i ../kernel-4.16.patch
# 5.17, PDE_DATA() renamed to pde_data()
# Joan Bruguera via Ike Devolder
patch -Np1 -i ../kernel-5.17.patch
cd kernel
sed -i "s/__VERSION_STRING/${pkgver}/" dkms.conf
sed -i 's/__JOBS/`nproc`/' dkms.conf

35
kernel-5.17.patch Normal file
View file

@ -0,0 +1,35 @@
From 026a2a54a234cdb7bf78c17be7ea29d8dcf9f390 Mon Sep 17 00:00:00 2001
From: Joan Bruguera <joanbrugueram@gmail.com>
Date: Sun, 23 Jan 2022 16:28:18 +0100
Subject: [PATCH] Tentative fix for NVIDIA 470.94 driver for Linux 5.17-rc1
See also: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=359745d78351c6f5442435f81549f0207ece28aa
---
kernel/common/inc/nv-procfs.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/kernel/common/inc/nv-procfs.h b/kernel/common/inc/nv-procfs.h
index 7c3e1a3..462eac1 100644
--- a/kernel/common/inc/nv-procfs.h
+++ b/kernel/common/inc/nv-procfs.h
@@ -10,6 +10,7 @@
#ifndef _NV_PROCFS_UTILS_H
#define _NV_PROCFS_UTILS_H
+#include <linux/version.h>
#include "conftest.h"
#ifdef CONFIG_PROC_FS
@@ -87,6 +88,8 @@ typedef struct file_operations nv_proc_ops_t;
#if defined(NV_PDE_DATA_PRESENT)
# define NV_PDE_DATA(inode) PDE_DATA(inode)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 17, 0))
+# define NV_PDE_DATA(inode) pde_data(inode)
#else
# define NV_PDE_DATA(inode) PDE(inode)->data
#endif
--
2.34.1