Author: leigh123linux Update of /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15615 Modified Files: 3.19_kernel.patch nvidia-340xx-kmod.spec Log Message: * Tue Jan 27 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:340.65-4 - revert commit (don't replace main driver) - fix 3.19 patch for rc6 3.19_kernel.patch: nv-frontend.c | 8 ++++++++ nv.c | 4 ++++ 2 files changed, 12 insertions(+) Index: 3.19_kernel.patch =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/3.19_kernel.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- 3.19_kernel.patch 12 Jan 2015 00:54:09 -0000 1.1 +++ 3.19_kernel.patch 27 Jan 2015 13:34:29 -0000 1.2 @@ -1,18 +1,5 @@ --- a/kernel/nv-frontend.c 2014-12-01 23:26:56.000000000 +0000 +++ b/kernel/nv-frontend.c 2015-01-08 11:51:16.760546089 +0000 -@@ -15,8 +15,12 @@ - #include "nv-frontend.h" - - #if defined(MODULE_LICENSE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) -+MODULE_LICENSE("GPL"); -+#else - MODULE_LICENSE("NVIDIA"); - #endif -+#endif - #if defined(MODULE_INFO) - MODULE_INFO(supported, "external"); - #endif @@ -327,7 +327,11 @@ long nvidia_frontend_unlocked_ioctl( unsigned long i_arg ) @@ -39,19 +26,6 @@ int nvidia_frontend_mmap( --- a/kernel/nv.c 2014-12-01 23:26:56.000000000 +0000 +++ b/kernel/nv.c 2015-01-08 11:53:05.122427804 +0000 -@@ -30,8 +30,12 @@ - - #if defined(NV_VMWARE) || (NV_BUILD_MODULE_INSTANCES != 0) - #if defined(MODULE_LICENSE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) -+MODULE_LICENSE("GPL"); -+#else - MODULE_LICENSE("NVIDIA"); - #endif -+#endif - #if defined(MODULE_INFO) - MODULE_INFO(supported, "external"); - #endif @@ -1839,7 +1839,11 @@ nvidia_unlocked_ioctl( unsigned long i_arg ) Index: nvidia-340xx-kmod.spec =================================================================== RCS file: /cvs/nonfree/rpms/nvidia-340xx-kmod/F-20/nvidia-340xx-kmod.spec,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- nvidia-340xx-kmod.spec 16 Jan 2015 19:35:44 -0000 1.3 +++ nvidia-340xx-kmod.spec 27 Jan 2015 13:34:29 -0000 1.4 @@ -3,13 +3,13 @@ # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed -%global buildforkernels newest +%global buildforkernels current Name: nvidia-340xx-kmod Epoch: 1 Version: 340.65 # Taken over by kmodtool -Release: 3%{?dist}.1 +Release: 4%{?dist} Summary: NVIDIA display driver kernel module Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -29,7 +29,7 @@ %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } # kmodtool does its magic here -%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} %(if [ 0%{?fedora} == 020 ]; then echo --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release}; fi) 2>/dev/null) } +%{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description The nvidia %{version} display driver kernel module for kernel %{kversion}. @@ -39,11 +39,7 @@ # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: -kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} \ -%if 0%{?fedora} == 20 - --obsolete-name nvidia --obsolete-version %{?epoch}:%{version}-%{release} \ -%endif -2>/dev/null +kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null %setup -T -c tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz # patch loop @@ -91,6 +87,10 @@ %changelog +* Tue Jan 27 2015 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 1:340.65-4 +- revert commit (don't replace main driver) +- fix 3.19 patch for rc6 + * Fri Jan 16 2015 Przemysław Palacz <pprzemal(a)gmail.com&gt; - 1:340.65-3.1 - Rebuilt for kernel