diff options
-rw-r--r-- | .SRCINFO | 18 | ||||
-rw-r--r-- | 130-nvidia-open-reproducible-build.patch | 7 | ||||
-rw-r--r-- | 140-nvidia-open-gcc-sls.patch | 2 | ||||
-rw-r--r-- | PKGBUILD | 12 |
4 files changed, 21 insertions, 18 deletions
@@ -1,11 +1,11 @@ pkgbase = nvidia-open-git pkgdesc = NVIDIA open GPU kernel modules (git version) - pkgver = 525.85.12.r0.g1dc88ff75 - pkgrel = 2 + pkgver = 550.54.14.r0.g476bd3453 + pkgrel = 1 url = https://github.com/NVIDIA/open-gpu-kernel-modules/ arch = x86_64 license = MIT - license = GPL2 + license = GPL-2.0-only makedepends = git makedepends = linux-headers options = !buildflags @@ -19,14 +19,14 @@ pkgbase = nvidia-open-git sha256sums = SKIP sha256sums = 009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea sha256sums = b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45 - sha256sums = 5916c0250a45a216f407f79fb2f44323eae0895804812c428baa98113afc1339 - sha256sums = baa891c56747a4862f64f3259aebcaf24beade8d850a77468f92d4f9bbf6cd7f + sha256sums = 15421d72aabc569c69762c77c7a37ad7be617f08e3c833318cecdeb5500e8ef4 + sha256sums = 71158935db9494bf8a18c34b29e2be19424ba09ce3017b9d9d7b6509f6090118 pkgname = nvidia-open-git depends = linux depends = libglvnd - depends = nvidia-utils>=525.85 - provides = nvidia-open=525.85.12.r0.g1dc88ff75 + depends = nvidia-utils>=550.54 + provides = nvidia-open=550.54.14.r0.g476bd3453 provides = NVIDIA-MODULE conflicts = nvidia-open conflicts = NVIDIA-MODULE @@ -35,8 +35,8 @@ pkgname = nvidia-open-dkms-git pkgdesc = NVIDIA open GPU kernel modules (sources; git version) depends = dkms depends = libglvnd - depends = nvidia-utils>=525.85 - provides = nvidia-open=525.85.12.r0.g1dc88ff75 + depends = nvidia-utils>=550.54 + provides = nvidia-open=550.54.14.r0.g476bd3453 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 00af56bef7b6..de737de8dacd 100644 --- a/130-nvidia-open-reproducible-build.patch +++ b/130-nvidia-open-reproducible-build.patch @@ -1,6 +1,6 @@ --- a/utils.mk +++ b/utils.mk -@@ -104,16 +104,13 @@ MKDIR ?= mkdir -p +@@ -104,17 +104,15 @@ MKDIR ?= mkdir -p RM ?= rm -f TOUCH ?= touch HARDLINK ?= ln -f @@ -11,11 +11,12 @@ OBJCOPY ?= objcopy XZ ?= xz -WHOAMI ?= whoami -- ++WHOAMI ?= printf '%s\n' archlinux_builder + PKG_CONFIG ?= pkg-config + -ifndef HOSTNAME - HOSTNAME = $(shell hostname) -endif -+WHOAMI ?= printf '%s\n' archlinux_builder +HOSTNAME ?= archlinux diff --git a/140-nvidia-open-gcc-sls.patch b/140-nvidia-open-gcc-sls.patch index 258026c64a72..6c90e872eab7 100644 --- a/140-nvidia-open-gcc-sls.patch +++ b/140-nvidia-open-gcc-sls.patch @@ -1,6 +1,6 @@ --- a/src/nvidia-modeset/Makefile +++ b/src/nvidia-modeset/Makefile -@@ -142,6 +142,7 @@ ifeq ($(TARGET_ARCH),x86_64) +@@ -150,6 +150,7 @@ ifeq ($(TARGET_ARCH),x86_64) CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fno-jump-tables) CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern) CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register) @@ -2,12 +2,12 @@ pkgbase=nvidia-open-git pkgname=('nvidia-open-git' 'nvidia-open-dkms-git') -pkgver=525.85.12.r0.g1dc88ff75 -pkgrel=2 +pkgver=550.54.14.r0.g476bd3453 +pkgrel=1 pkgdesc='NVIDIA open GPU kernel modules (git version)' arch=('x86_64') url='https://github.com/NVIDIA/open-gpu-kernel-modules/' -license=('MIT' 'GPL2') +license=('MIT' 'GPL-2.0-only') makedepends=('git' 'linux-headers') options=('!buildflags' '!lto' '!strip') source=('git+https://github.com/NVIDIA/open-gpu-kernel-modules.git' @@ -18,8 +18,8 @@ source=('git+https://github.com/NVIDIA/open-gpu-kernel-modules.git' sha256sums=('SKIP' '009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea' 'b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45' - '5916c0250a45a216f407f79fb2f44323eae0895804812c428baa98113afc1339' - 'baa891c56747a4862f64f3259aebcaf24beade8d850a77468f92d4f9bbf6cd7f') + '15421d72aabc569c69762c77c7a37ad7be617f08e3c833318cecdeb5500e8ef4' + '71158935db9494bf8a18c34b29e2be19424ba09ce3017b9d9d7b6509f6090118') prepare() { patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/110-nvidia-open-change-dkms-conf.patch" @@ -27,6 +27,8 @@ prepare() { patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/130-nvidia-open-reproducible-build.patch" patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/140-nvidia-open-gcc-sls.patch" + sed -i "s/__VERSION_STRING/${pkgver}/" open-gpu-kernel-modules/kernel-open/dkms.conf + [ -d dkms-src ] && rm -rf dkms-src cp -af open-gpu-kernel-modules/kernel-open dkms-src } |