commit b15ff11ddc474ef0467d338a25a39c85cc95a7cf
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Wed Dec 6 20:11:08 2017 +0200
disable -Wsign-compare because of ./include/linux/cpumask.h:213:9: warning: comparison
between signed and unsigned integer expressions [-Wsign-compare]
disable-warnings.patch | 12 ++++++++++++
nvidia-304xx-kmod.spec | 11 ++++++++---
2 files changed, 20 insertions(+), 3 deletions(-)
---
diff --git a/disable-warnings.patch b/disable-warnings.patch
new file mode 100644
index 0000000..f793757
--- /dev/null
+++ b/disable-warnings.patch
@@ -0,0 +1,12 @@
+diff -ur a/kernel/Makefile.kbuild b/kernel/Makefile.kbuild
+--- a/kernel/Makefile.kbuild 2017-09-14 23:51:09.000000003 +0300
++++ b/kernel/Makefile.kbuild 2017-12-06 18:16:36.884825684 +0200
+@@ -64,7 +64,7 @@
+ #
+
+ EXTRA_CFLAGS += -I$(src)
+-EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wsign-compare -Wno-cast-qual
-Wno-error
++EXTRA_CFLAGS += -Wall -MD $(DEFINES) $(INCLUDES) -Wno-cast-qual -Wno-error
+
+ #
+ # We rely on these two definitions below; if they aren't set, we set them to
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index ea9641b..e47f611 100644
--- a/nvidia-304xx-kmod.spec
+++ b/nvidia-304xx-kmod.spec
@@ -9,7 +9,7 @@
Name: nvidia-304xx-kmod
Version: 304.137
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,7 +21,8 @@ Source0: nvidia-kmod-data-%{version}.tar.xz
Source11: nvidia-304xx-kmodtool-excludekernel-filterfile
#
https://anonscm.debian.org/viewvc/pkg-nvidia/packages/nvidia-graphics-dri...
-#Patch0: disable-mtrr.patch
+Patch0: disable-warnings.patch
+Patch1: 4.14_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,7 +49,8 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name}
--filterf
for arch in x86 x64
do
pushd nvidiapkg-${arch}
-#patch0 -p0
+%patch0 -p1
+%patch1 -p1
popd
done
@@ -82,6 +84,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Dec 06 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-3
+- patch for kernel-4.14
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
- remove no longer needed 4.12_kernel.patch