[nvidia-kmod] Patch for 4.13 kernel
by Leigh Scott
commit 33ccd5ab1f55bc88ae21c6039d8f9db702ef7d19
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Sep 23 09:47:20 2017 +0100
Patch for 4.13 kernel
4.13_hack_license_as_kernel_devs_hate_us.patch | 93 ++++++++++++++++++++++++++
nvidia-kmod.spec | 7 +-
2 files changed, 99 insertions(+), 1 deletion(-)
---
diff --git a/4.13_hack_license_as_kernel_devs_hate_us.patch b/4.13_hack_license_as_kernel_devs_hate_us.patch
new file mode 100644
index 0000000..eddcb4c
--- /dev/null
+++ b/4.13_hack_license_as_kernel_devs_hate_us.patch
@@ -0,0 +1,93 @@
+diff -uNrp a/kernel/nvidia/nv.c b/kernel/nvidia/nv.c
+--- a/kernel/nvidia/nv.c 2017-09-20 02:33:09.000000000 +0100
++++ b/kernel/nvidia/nv.c 2017-09-23 08:43:37.590119035 +0100
+@@ -38,8 +38,12 @@
+
+ #if (NV_BUILD_MODULE_INSTANCES != 0)
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++MODULE_LICENSE("GPL");
++#else
+ MODULE_LICENSE("NVIDIA");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
+diff -uNrp a/kernel/nvidia/nv-frontend.c b/kernel/nvidia/nv-frontend.c
+--- a/kernel/nvidia/nv-frontend.c 2017-09-20 02:33:10.000000000 +0100
++++ b/kernel/nvidia/nv-frontend.c 2017-09-23 08:46:59.087803132 +0100
+@@ -15,8 +15,12 @@
+ #include "nv-frontend.h"
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++MODULE_LICENSE("GPL");
++#else
+ MODULE_LICENSE("NVIDIA");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
+diff -uNrp a/kernel/nvidia-drm/nvidia-drm-linux.c b/kernel/nvidia-drm/nvidia-drm-linux.c
+--- a/kernel/nvidia-drm/nvidia-drm-linux.c 2017-09-20 02:33:13.000000000 +0100
++++ b/kernel/nvidia-drm/nvidia-drm-linux.c 2017-09-23 09:25:40.161980854 +0100
+@@ -23,6 +23,7 @@
+ #include <linux/module.h>
+ #include <linux/slab.h>
+ #include <linux/err.h>
++#include <linux/version.h>
+
+ #include "nvidia-drm-os-interface.h"
+ #include "nvidia-drm.h"
+@@ -185,8 +186,12 @@ module_init(nv_linux_drm_init);
+ module_exit(nv_linux_drm_exit);
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++ MODULE_LICENSE("Dual MIT/GPL");
++#else
+ MODULE_LICENSE("MIT");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
+diff -uNrp a/kernel/nvidia-modeset/nvidia-modeset-linux.c b/kernel/nvidia-modeset/nvidia-modeset-linux.c
+--- a/kernel/nvidia-modeset/nvidia-modeset-linux.c 2017-09-20 02:33:12.000000000 +0100
++++ b/kernel/nvidia-modeset/nvidia-modeset-linux.c 2017-09-23 09:03:19.673090364 +0100
+@@ -21,6 +21,7 @@
+ #include <linux/random.h>
+ #include <linux/file.h>
+ #include <linux/list.h>
++#include <linux/version.h>
+
+ #include "nvstatus.h"
+
+@@ -1309,8 +1310,12 @@ module_init(nvkms_init);
+ module_exit(nvkms_exit);
+
+ #if defined(MODULE_LICENSE)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++ MODULE_LICENSE("GPL");
++#else
+ MODULE_LICENSE("NVIDIA");
+ #endif
++#endif
+ #if defined(MODULE_INFO)
+ MODULE_INFO(supported, "external");
+ #endif
+diff -uNrp a/kernel/nvidia-uvm/uvm_common.c b/kernel/nvidia-uvm/uvm_common.c
+--- a/kernel/nvidia-uvm/uvm_common.c 2017-09-20 02:33:10.000000000 +0100
++++ b/kernel/nvidia-uvm/uvm_common.c 2017-09-23 09:02:44.989610766 +0100
+@@ -388,5 +388,9 @@ module_param(uvm_enable_builtin_tests, i
+ MODULE_PARM_DESC(uvm_enable_builtin_tests,
+ "Enable the UVM built-in tests. (This is a security risk)");
+
++#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 13, 0)
++MODULE_LICENSE("Dual MIT/GPL");
++#else
+ MODULE_LICENSE("MIT");
++#endif
+ MODULE_INFO(supported, "external");
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index d4dc994..d970f32 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-kmod
Epoch: 2
Version: 384.90
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,6 +19,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
+Patch2: 4.13_hack_license_as_kernel_devs_hate_us.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -44,6 +45,7 @@ tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{versi
# patch loop
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -71,6 +73,9 @@ done
%changelog
+* Sat Sep 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.90-2
+- Patch for 4.13 kernel
+
* Thu Sep 21 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:384.90-1
- Update to 384.90 release
6 years, 7 months
[vlc/f26] Update to vdd2017
by Nicolas Chauvet
Summary of changes:
665d289... Update to vdd2017 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[vlc/f27] Update to vdd2017
by Nicolas Chauvet
Summary of changes:
665d289... Update to vdd2017 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 7 months
[vlc] Update to vdd2017
by Nicolas Chauvet
commit 665d289f4e987cabe7392f44b7665f0c17d91e26
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Sep 22 20:31:10 2017 +0200
Update to vdd2017
sources | 2 +-
vlc.spec | 10 +++++++---
2 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/sources b/sources
index c758172..5293529 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f8beb4af233ac35a47570871b1e350a4 vlc-3.0.0-20170823-0243-git.tar.xz
+9947671bbf29c2ab46c919d8e7a853e4 vlc-3.0.0-20170922-0239-git.tar.xz
diff --git a/vlc.spec b/vlc.spec
index 6f1c6d6..f6d23ad 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -1,5 +1,5 @@
-%global vlc_date 20170823
-%global vlc_rc -%{?vlc_date}-0243-git
+%global vlc_date 20170922
+%global vlc_rc -%{?vlc_date}-0239-git
%if 0%{?vlc_rc:1}
%global vlc_url https://nightlies.videolan.org/build/source/
%else
@@ -39,7 +39,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 3.0.0
-Release: 0.34%{?vlc_date:.git%{vlc_date}}%{?dist}
+Release: 0.35%{?vlc_date:.git%{vlc_date}}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -550,6 +550,10 @@ fi || :
%changelog
+* Fri Sep 22 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.35.git20170922
+- Update to VDD2017 edition
+- https://www.videolan.org/videolan/events/vdd17/
+
* Wed Aug 23 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 3.0.0-0.34.git20170823
- Update snapshot
6 years, 7 months
[nvidia-304xx-kmod/f27] remove no longer needed 4.12_kernel.patch
by Nerijus Baliūnas
commit 442e881b75dab21b7c92811cbbd07f1c0c9ca6d0
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Fri Sep 22 13:06:59 2017 +0300
remove no longer needed 4.12_kernel.patch
4.12_kernel.patch | 79 --------------------------------------------------
nvidia-304xx-kmod.spec | 7 +++--
2 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 1907b49..ea9641b 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: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,7 +22,6 @@ 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
-Patch1: 4.12_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,6 @@ for arch in x86 x64
do
pushd nvidiapkg-${arch}
#patch0 -p0
-%patch1 -p1
popd
done
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
+- remove no longer needed 4.12_kernel.patch
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-1
- Update to 304.137
6 years, 7 months
[nvidia-304xx-kmod/f26] remove no longer needed 4.12_kernel.patch
by Nerijus Baliūnas
commit 78add46cdff0485cad3797de1416b37c9e4a1c68
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Fri Sep 22 13:02:31 2017 +0300
remove no longer needed 4.12_kernel.patch
4.12_kernel.patch | 79 --------------------------------------------------
nvidia-304xx-kmod.spec | 7 +++--
2 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 1907b49..ea9641b 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: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,7 +22,6 @@ 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
-Patch1: 4.12_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,6 @@ for arch in x86 x64
do
pushd nvidiapkg-${arch}
#patch0 -p0
-%patch1 -p1
popd
done
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
+- remove no longer needed 4.12_kernel.patch
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-1
- Update to 304.137
6 years, 7 months
[nvidia-304xx-kmod/f25] remove no longer needed 4.12_kernel.patch
by Nerijus Baliūnas
commit be9938171e9a864a48c32353bfa36bf559e92e04
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Fri Sep 22 12:58:36 2017 +0300
remove no longer needed 4.12_kernel.patch
4.12_kernel.patch | 79 --------------------------------------------------
nvidia-304xx-kmod.spec | 7 +++--
2 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 1907b49..ea9641b 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: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,7 +22,6 @@ 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
-Patch1: 4.12_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,6 @@ for arch in x86 x64
do
pushd nvidiapkg-${arch}
#patch0 -p0
-%patch1 -p1
popd
done
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
+- remove no longer needed 4.12_kernel.patch
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-1
- Update to 304.137
6 years, 7 months
[nvidia-304xx-kmod] remove no longer needed 4.12_kernel.patch
by Nerijus Baliūnas
commit 12b2e2a95ff546109f8b22c4745a9e60ba30f5c4
Author: Nerijus Baliūnas <nerijus(a)users.sourceforge.net>
Date: Fri Sep 22 12:53:21 2017 +0300
remove no longer needed 4.12_kernel.patch
4.12_kernel.patch | 79 --------------------------------------------------
nvidia-304xx-kmod.spec | 7 +++--
2 files changed, 4 insertions(+), 82 deletions(-)
---
diff --git a/nvidia-304xx-kmod.spec b/nvidia-304xx-kmod.spec
index 1907b49..ea9641b 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: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -22,7 +22,6 @@ 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
-Patch1: 4.12_kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,7 +49,6 @@ for arch in x86 x64
do
pushd nvidiapkg-${arch}
#patch0 -p0
-%patch1 -p1
popd
done
@@ -84,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-2
+- remove no longer needed 4.12_kernel.patch
+
* Fri Sep 22 2017 Nerijus Baliūnas <nerijus(a)users.sourceforge.net> - 304.137-1
- Update to 304.137
6 years, 7 months