[packages/xorg-driver-video-nvidia] patch to fix build against kernel 4.14 with struct randomization; rel 3

atler atler at pld-linux.org
Tue Nov 14 00:05:03 CET 2017


commit 114c4602f331a2c4646f1f07128098013b7e1190
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Nov 14 00:02:48 2017 +0100

    patch to fix build against kernel 4.14 with struct randomization; rel 3

 structrand.patch              | 13 +++++++++++++
 xorg-driver-video-nvidia.spec |  4 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/xorg-driver-video-nvidia.spec b/xorg-driver-video-nvidia.spec
index d9c5f70..766d4f2 100644
--- a/xorg-driver-video-nvidia.spec
+++ b/xorg-driver-video-nvidia.spec
@@ -33,7 +33,7 @@ exit 1
 
 %define		no_install_post_check_so 1
 
-%define		rel	2
+%define		rel	3
 %define		pname	xorg-driver-video-nvidia
 Summary:	Linux Drivers for nVidia GeForce/Quadro Chips
 Summary(hu.UTF-8):	Linux meghajtók nVidia GeForce/Quadro chipekhez
@@ -55,6 +55,7 @@ Source4:	10-nvidia.conf
 Source5:	10-nvidia-modules.conf
 Patch0:		X11-driver-nvidia-GL.patch
 Patch1:		X11-driver-nvidia-desktop.patch
+Patch2:		structrand.patch
 URL:		http://www.nvidia.com/object/unix.html
 BuildRequires:	rpmbuild(macros) >= 1.701
 %{?with_kernel:%{expand:%buildrequires_kernel kernel%%{_alt_kernel}-module-build >= 3:2.6.20.2}}
@@ -268,6 +269,7 @@ rm -rf NVIDIA-Linux-x86*-%{version}*
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p0
 echo 'EXTRA_CFLAGS += -Wno-pointer-arith -Wno-sign-compare -Wno-unused' >> kernel/Makefile.kbuild
 
 %build
diff --git a/structrand.patch b/structrand.patch
new file mode 100644
index 0000000..959c484
--- /dev/null
+++ b/structrand.patch
@@ -0,0 +1,13 @@
+--- kernel/nvidia-modeset/nvidia-modeset-linux.c.dist	2017-07-20 04:25:38.000000000 -0400
++++ kernel/nvidia-modeset/nvidia-modeset-linux.c	2017-08-02 14:44:22.979688575 -0400
+@@ -337,8 +337,8 @@
+ 
+ static nvidia_modeset_rm_ops_t __rm_ops = { 0 };
+ static nvidia_modeset_callbacks_t nvkms_rm_callbacks = {
+-    nvkms_suspend,
+-    nvkms_resume
++    .suspend = nvkms_suspend,
++    .resume = nvkms_resume
+ };
+ 
+ static int nvkms_alloc_rm(void)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-nvidia.git/commitdiff/114c4602f331a2c4646f1f07128098013b7e1190



More information about the pld-cvs-commit mailing list