commit bef42119daf41a41280f17a21c9619a32cae241a Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Aug 19 01:37:06 2020 +0100 Revert "Update to 440.100 release" This reverts commit 3e193a24b437bb3f2891a05ec8fd9d4e2d12c17f. kernel-5.7.patch | 22 ++++++++++++++++++++++ nvidia-kmod.spec | 9 ++++----- 2 files changed, 26 insertions(+), 5 deletions(-) --- diff --git a/kernel-5.7.patch b/kernel-5.7.patch new file mode 100644 index 0000000..a6821b5 --- /dev/null +++ b/kernel-5.7.patch @@ -0,0 +1,22 @@ +diff --git a/kernel/conftest.sh b/kernel/conftest.sh +index 8f807a1..af29636 100755 +--- a/kernel/conftest.sh ++++ b/kernel/conftest.sh +@@ -143,6 +143,7 @@ test_headers() { + FILES="$FILES video/nv_internal.h" + FILES="$FILES asm/book3s/64/hash-64k.h" + FILES="$FILES asm/set_memory.h" ++ FILES="$FILES asm/pgtable.h" + FILES="$FILES asm/prom.h" + FILES="$FILES asm/powernv.h" + FILES="$FILES asm/tlbflush.h" +@@ -466,6 +467,9 @@ compile_test() { + # It does not exist on all architectures. + # + CODE=" ++ #if defined(NV_ASM_PGTABLE_H_PRESENT) ++ #include <asm/pgtable.h> ++ #endif + #if defined(NV_ASM_SET_MEMORY_H_PRESENT) + #include <asm/set_memory.h> + #else diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec index 5aaea5c..00cd42b 100644 --- a/nvidia-kmod.spec +++ b/nvidia-kmod.spec @@ -10,14 +10,15 @@ Name: nvidia-kmod Epoch: 3 -Version: 440.100 +Version: 440.82 # Taken over by kmodtool -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA display driver kernel module License: Redistributable, no modification permitted URL: http://www.nvidia.com/ Source11: nvidia-kmodtool-excludekernel-filterfile +Patch0: kernel-5.7.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: x86_64 @@ -41,6 +42,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz # patch loop +%patch0 -p1 for kernel_version in %{?kernel_versions} ; do cp -a kernel _kmod_build_${kernel_version%%___*} @@ -68,9 +70,6 @@ done %changelog -* Thu Jun 25 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:440.100-1 -- Update to 440.100 release - * Wed Apr 15 2020 Leigh Scott <leigh123linux(a)gmail.com&gt; - 3:440.82-2 - Patch for kernel-5.7rc