summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2022-06-04 10:49:38 -0300
committerDaniel Bermond2022-06-04 10:49:38 -0300
commitcf446374abd98abb367580793aa3b65b7ea4e253 (patch)
treeb5a8fecab4399fc98316e59b783ecaca38994d51
parenta9add44241f59ca79459f78408d00ef511f46c46 (diff)
downloadaur-cf446374abd98abb367580793aa3b65b7ea4e253.tar.gz
Match latest upstream changes
-rw-r--r--.SRCINFO14
-rw-r--r--130-nvidia-open-reproducible-build.patch11
-rw-r--r--PKGBUILD9
3 files changed, 18 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index bbfc1c741442..ac8f6af7dc7f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = nvidia-open-git
pkgdesc = NVIDIA open GPU kernel modules (git version)
- pkgver = 515.43.04.r10.gd8f3bcff9
- pkgrel = 3
+ pkgver = 515.48.07.r0.g965db9855
+ pkgrel = 1
url = https://github.com/NVIDIA/open-gpu-kernel-modules/
arch = x86_64
license = MIT
@@ -18,13 +18,13 @@ pkgbase = nvidia-open-git
sha256sums = SKIP
sha256sums = 009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea
sha256sums = b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45
- sha256sums = deb3a33519fe62a60eb9d35861576dd8d67fc3d17834195e54fe374c6ece387b
+ sha256sums = b7ac1ca4d72fc8392e6682df616d53ba4e9d4e761217ac6339d32c377990cf64
pkgname = nvidia-open-git
depends = linux
- depends = nvidia-utils=515.43.04
+ depends = nvidia-utils=515.48.07
depends = libglvnd
- provides = nvidia-open=515.43.04.r10.gd8f3bcff9
+ provides = nvidia-open=515.48.07.r0.g965db9855
provides = NVIDIA-MODULE
conflicts = nvidia-open
conflicts = NVIDIA-MODULE
@@ -32,9 +32,9 @@ pkgname = nvidia-open-git
pkgname = nvidia-open-dkms-git
pkgdesc = NVIDIA open GPU kernel modules (sources; git version)
depends = dkms
- depends = nvidia-utils=515.43.04
+ depends = nvidia-utils=515.48.07
depends = libglvnd
- provides = nvidia-open=515.43.04.r10.gd8f3bcff9
+ provides = nvidia-open=515.48.07.r0.g965db9855
provides = NVIDIA-MODULE
conflicts = nvidia-open
conflicts = NVIDIA-MODULE
diff --git a/130-nvidia-open-reproducible-build.patch b/130-nvidia-open-reproducible-build.patch
index 7e0b2df1607e..78181592d831 100644
--- a/130-nvidia-open-reproducible-build.patch
+++ b/130-nvidia-open-reproducible-build.patch
@@ -1,6 +1,6 @@
--- a/utils.mk
-+++ v/utils.mk
-@@ -101,13 +101,13 @@ MKDIR ?= mkdir -p
++++ b/utils.mk
+@@ -101,16 +101,13 @@ MKDIR ?= mkdir -p
RM ?= rm -f
TOUCH ?= touch
HARDLINK ?= ln -f
@@ -11,9 +11,12 @@
OBJCOPY ?= objcopy
XZ ?= xz
-WHOAMI ?= whoami
--HOSTNAME ?= hostname
+-
+-ifndef HOSTNAME
+- HOSTNAME = $(shell hostname)
+-endif
+WHOAMI ?= printf '%s\n' archlinux_builder
+HOSTNAME ?= printf '%s\n' archlinux
+
NV_AUTO_DEPEND ?= 1
- NV_VERBOSE ?= 0
diff --git a/PKGBUILD b/PKGBUILD
index 6f6438b02506..2c8e50e6dce1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
pkgbase=nvidia-open-git
pkgname=('nvidia-open-git' 'nvidia-open-dkms-git')
-pkgver=515.43.04.r10.gd8f3bcff9
-pkgrel=3
+pkgver=515.48.07.r0.g965db9855
+pkgrel=1
pkgdesc='NVIDIA open GPU kernel modules (git version)'
arch=('x86_64')
url='https://github.com/NVIDIA/open-gpu-kernel-modules/'
@@ -17,7 +17,7 @@ source=('git+https://github.com/NVIDIA/open-gpu-kernel-modules.git'
sha256sums=('SKIP'
'009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea'
'b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45'
- 'deb3a33519fe62a60eb9d35861576dd8d67fc3d17834195e54fe374c6ece387b')
+ 'b7ac1ca4d72fc8392e6682df616d53ba4e9d4e761217ac6339d32c377990cf64')
prepare() {
patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/110-nvidia-open-change-dkms-conf.patch"
@@ -42,8 +42,7 @@ build() {
then
KERNEL_UNAME="$(uname -r)"
else
- KERNEL_UNAME="$(find /usr/lib/modules -mindepth 1 -maxdepth 1 -type d | head -n1)"
- KERNEL_UNAME="${KERNEL_UNAME##*/}"
+ KERNEL_UNAME="$(find /usr/lib/modules -mindepth 1 -maxdepth 1 -type d | head -n1 | sed 's|.*/||')"
fi
unset -v SYSSRC