- readded n_kernel_write.patch and apply it again for sle12-sp4/sle12…

…-sp5/sle15/sle15-sp1/Leap15/Leap15.1
AndyDick · Sep 2, 2020 · f811ccd · f811ccd
1 parent 01e802b
commit f811ccd
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 0 deletions.
diff --git a/n_kernel_write.patch b/n_kernel_write.patch
@@ -0,0 +1,34 @@
+--- kernel/conftest.sh.orig	2019-05-15 14:40:51.082287653 +0200
++++ kernel/conftest.sh	2019-05-15 14:54:12.948955304 +0200
+@@ -1567,29 +1567,8 @@
+                 rm -f conftest$$.o
+             else
+                 echo "#define NV_KERNEL_WRITE_PRESENT" | append_conftest "function"
+-
+-                #
+-                # Determine the pos argument type, which was changed by
+-                # commit e13ec939e96b1 (fs: fix kernel_write prototype) on
+-                # 9/1/2017.
+-                #
+-                echo "$CONFTEST_PREAMBLE
+-                #include <linux/fs.h>
+-                ssize_t kernel_write(struct file *file, const void *buf,
+-                                     size_t count, loff_t *pos)
+-                {
+-                    return 0;
+-                }" > conftest$$.c;
+-
+-                $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1
+-                rm -f conftest$$.c
+-
+-                if [ -f conftest$$.o ]; then
+-                    echo "#define NV_KERNEL_WRITE_HAS_POINTER_POS_ARG" | append_conftest "function"
+-                    rm -f conftest$$.o
+-                else
+-                    echo "#undef NV_KERNEL_WRITE_HAS_POINTER_POS_ARG" | append_conftest "function"
+-                fi
++                # hardcode on sle12-sp4/sle12-sp5/sle15/sle15-sp1/Leap15/Leap15.1
++                echo "#define NV_KERNEL_WRITE_HAS_POINTER_POS_ARG" | append_conftest "function"
+             fi
+         ;;
+
diff --git a/nvidia-gfxG05.changes b/nvidia-gfxG05.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  2 21:32:20 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- readded n_kernel_write.patch and apply it again for 
+  sle12-sp4/sle12-sp5/sle15/sle15-sp1/Leap15/Leap15.1 
+
 -------------------------------------------------------------------
 Wed Sep  2 16:22:05 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
 

diff --git a/nvidia-gfxG05.spec b/nvidia-gfxG05.spec
@@ -56,6 +56,7 @@ Source23:       kmp-trigger-old.sh
 NoSource:       1
 NoSource:       6
 NoSource:       7
+Patch1:         n_kernel_write.patch
 Patch2:         mmu.patch
 Patch3:         kernel-5.9.patch
 Patch4:         license.patch
@@ -186,6 +187,11 @@ echo "kver = %kver"
 sh %{SOURCE1} -x
 pushd NVIDIA-Linux-x86*-%{version}*/
 # apply patches here ...
+%if 0%{?sle_version} >= 120400
+%if 0%{?sle_version} < 150200
+%patch1 -p0
+%endif
+%endif
 %if 0%{?suse_version} >=  1550
 %patch2 -p1
 %patch3 -p1

diff --git a/x11-video-nvidiaG05.changes b/x11-video-nvidiaG05.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep  2 21:35:33 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
+
+- readded n_kernel_write.patch and apply it again for 
+  sle12-sp4/sle12-sp5/sle15/sle15-sp1/Leap15/Leap15.1 
+
 -------------------------------------------------------------------
 Wed Sep  2 16:24:31 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>