Match latest upstream changes. Fix reproducible patch.

5 files changed, 25 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b8f3b1b82d29..f1fd87b1fc7d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = nvidia-open-git
 	pkgdesc = NVIDIA open GPU kernel modules (git version)
-	pkgver = 515.57.r0.g94eaea972
+	pkgver = 525.85.12.r0.g1dc88ff75
 	pkgrel = 1
 	url = https://github.com/NVIDIA/open-gpu-kernel-modules/
 	arch = x86_64
@@ -15,18 +15,18 @@ pkgbase = nvidia-open-git
 	source = 110-nvidia-open-change-dkms-conf.patch
 	source = 120-nvidia-open-linux-rt-gift.patch
 	source = 130-nvidia-open-reproducible-build.patch
-	source = 140-nvidia-open-gcc-ibt-sls.patch
+	source = 140-nvidia-open-gcc-sls.patch
 	sha256sums = SKIP
 	sha256sums = 009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea
 	sha256sums = b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45
-	sha256sums = b7ac1ca4d72fc8392e6682df616d53ba4e9d4e761217ac6339d32c377990cf64
-	sha256sums = b9cb1715caa3431c32d9a1b11bda4dd10986747214a2a952a01da913433c421f
+	sha256sums = 5916c0250a45a216f407f79fb2f44323eae0895804812c428baa98113afc1339
+	sha256sums = baa891c56747a4862f64f3259aebcaf24beade8d850a77468f92d4f9bbf6cd7f
 
 pkgname = nvidia-open-git
 	depends = linux
-	depends = nvidia-utils=515.57
+	depends = nvidia-utils=525.85.12
 	depends = libglvnd
-	provides = nvidia-open=515.57.r0.g94eaea972
+	provides = nvidia-open=525.85.12.r0.g1dc88ff75
 	provides = NVIDIA-MODULE
 	conflicts = nvidia-open
 	conflicts = NVIDIA-MODULE
@@ -34,9 +34,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.57
+	depends = nvidia-utils=525.85.12
 	depends = libglvnd
-	provides = nvidia-open=515.57.r0.g94eaea972
+	provides = nvidia-open=525.85.12.r0.g1dc88ff75
 	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 78181592d831..00af56bef7b6 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
-@@ -101,16 +101,13 @@ MKDIR                 ?= mkdir -p
+@@ -104,16 +104,13 @@ MKDIR                 ?= mkdir -p
  RM                    ?= rm -f
  TOUCH                 ?= touch
  HARDLINK              ?= ln -f
@@ -16,7 +16,7 @@
 -  HOSTNAME             = $(shell hostname)
 -endif
 +WHOAMI                ?= printf '%s\n' archlinux_builder
-+HOSTNAME              ?= printf '%s\n' archlinux
++HOSTNAME              ?= archlinux
  
  
  NV_AUTO_DEPEND        ?= 1
diff --git a/140-nvidia-open-gcc-ibt-sls.patch b/140-nvidia-open-gcc-ibt-sls.patch
deleted file mode 100644
index 7c70d26f557b..000000000000
--- a/140-nvidia-open-gcc-ibt-sls.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/src/nvidia-modeset/Makefile
-+++ b/src/nvidia-modeset/Makefile
-@@ -96,7 +96,8 @@ CFLAGS += -ffunction-sections
- CFLAGS += -fdata-sections
- CFLAGS += -ffreestanding
- 
--CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -fcf-protection=none)
-+CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch)
-+CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all)
- CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -Wformat-overflow=2)
- CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -Wformat-truncation=1)
- ifeq ($(TARGET_ARCH),x86_64)
---- a/src/nvidia/Makefile
-+++ b/src/nvidia/Makefile
-@@ -120,7 +120,8 @@ CFLAGS += -fdata-sections
- NV_KERNEL_O_LDFLAGS += --gc-sections
- EXPORTS_LINK_COMMAND = exports_link_command.txt
- 
--CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=none)
-+CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch -mindirect-branch-register)
-+CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all)
- 
- ifeq ($(TARGET_ARCH),x86_64)
-   CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)
diff --git a/140-nvidia-open-gcc-sls.patch b/140-nvidia-open-gcc-sls.patch
new file mode 100644
index 000000000000..258026c64a72
--- /dev/null
+++ b/140-nvidia-open-gcc-sls.patch
@@ -0,0 +1,10 @@
+--- a/src/nvidia-modeset/Makefile
++++ b/src/nvidia-modeset/Makefile
+@@ -142,6 +142,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)
++  CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all)
+ endif
+ 
+ CFLAGS += $(CONDITIONAL_CFLAGS)
diff --git a/PKGBUILD b/PKGBUILD
index 64879c01cf7b..28da9f105ee4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=nvidia-open-git
 pkgname=('nvidia-open-git' 'nvidia-open-dkms-git')
-pkgver=515.57.r0.g94eaea972
+pkgver=525.85.12.r0.g1dc88ff75
 pkgrel=1
 pkgdesc='NVIDIA open GPU kernel modules (git version)'
 arch=('x86_64')
@@ -14,18 +14,18 @@ source=('git+https://github.com/NVIDIA/open-gpu-kernel-modules.git'
         '110-nvidia-open-change-dkms-conf.patch'
         '120-nvidia-open-linux-rt-gift.patch'
         '130-nvidia-open-reproducible-build.patch'
-        '140-nvidia-open-gcc-ibt-sls.patch')
+        '140-nvidia-open-gcc-sls.patch')
 sha256sums=('SKIP'
             '009724e2e07b7be589ba455f225a9742d88a3a29383f2f220cb830ef4c8b7aea'
             'b0f62a78f749ff3a104197c12b6d885352adcf35fb5ecf00c4cd4c51b4195e45'
-            'b7ac1ca4d72fc8392e6682df616d53ba4e9d4e761217ac6339d32c377990cf64'
-            'b9cb1715caa3431c32d9a1b11bda4dd10986747214a2a952a01da913433c421f')
+            '5916c0250a45a216f407f79fb2f44323eae0895804812c428baa98113afc1339'
+            'baa891c56747a4862f64f3259aebcaf24beade8d850a77468f92d4f9bbf6cd7f')
 
 prepare() {
     patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/110-nvidia-open-change-dkms-conf.patch"
     patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/120-nvidia-open-linux-rt-gift.patch"
     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-ibt-sls.patch"
+    patch -d open-gpu-kernel-modules -Np1 -i "${srcdir}/140-nvidia-open-gcc-sls.patch"
     
     [ -d dkms-src ] && rm -rf dkms-src
     cp -af open-gpu-kernel-modules/kernel-open dkms-src