[xorg-x11-drv-nvidia] Add systemd samples to doc
by Leigh Scott
commit 071b0fbac2e23cbd6cf924dbc647e91345548f52
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 27 20:33:36 2020 +0100
Add systemd samples to doc
xorg-x11-drv-nvidia.spec | 4 ++++
1 file changed, 4 insertions(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 8add3b6..44129c5 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -341,6 +341,9 @@ mkdir -p %{buildroot}%{_unitdir}
install -p -m 0644 %{SOURCE13} %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE14} %{buildroot}%{_unitdir}
+# Install systemd samples
+mkdir -p samples/systemd/
+install -p -m 0444 {nvidia-{suspend,hibernate,resume}.service,nvidia-sleep.sh,nvidia} samples/systemd/
%pre
if [ "$1" -eq "1" ]; then
@@ -391,6 +394,7 @@ fi ||:
%doc nvidiapkg/README.txt
%doc nvidiapkg/nvidia-application-profiles-%{version}-rc
%doc nvidiapkg/html
+%doc nvidiapkg/samples
%dir %{_alternate_dir}
%{_alternate_dir}/alternate-install-present
%{_datadir}/glvnd/egl_vendor.d/10_nvidia.json
4 years, 2 months
[vdr-softhddevice] Rebuilt for new VDR API version
by Martin Gansser
commit b37f7f569788ac6c9b198ed3fc2c0bca5ba6145c
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Aug 27 21:12:09 2020 +0200
Rebuilt for new VDR API version
sources | 2 +-
vdr-softhddevice.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/sources b/sources
index a7f860b..b15ee92 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4f6ff23660aba7909318c583770812ea vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2
+SHA512 (vdr-plugin-softhddevice-6dfa88aecf1b5a4c5932ba278209d9f22676547f.tar.bz2) = 676fb558d1b424cc2ae1f7dde365f9dc1080d6c809c5eb1292e597b5f72832c243d402388d2803cb18ddba70f0fc054db7b4f297a9bff66afff3af7dcf95c13a
diff --git a/vdr-softhddevice.spec b/vdr-softhddevice.spec
index fa3ed7e..2e20efb 100644
--- a/vdr-softhddevice.spec
+++ b/vdr-softhddevice.spec
@@ -10,7 +10,7 @@
Name: vdr-softhddevice
Version: 0.6.1
-Release: 25.%{gitdate}git%{shortcommit0}%{?dist}
+Release: 26.%{gitdate}git%{shortcommit0}%{?dist}
Summary: A software and GPU emulated HD output device plugin for VDR
License: AGPLv3
@@ -101,6 +101,9 @@ install -Dpm 644 %{SOURCE1} \
%license AGPL-3.0.txt
%changelog
+* Thu Aug 27 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 0.6.1-26.20151103git6dfa88a
+- Rebuilt for new VDR API version
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 0.6.1-25.20151103git6dfa88a
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years, 2 months
[vdr-skindesigner] Rebuilt for new VDR API version
by Martin Gansser
commit fbc7ea139baec797cf2c3f0c765763bd53a4fba3
Author: Martin Gansser <mgansser(a)online.de>
Date: Thu Aug 27 16:53:00 2020 +0200
Rebuilt for new VDR API version
vdr-skindesigner.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/vdr-skindesigner.spec b/vdr-skindesigner.spec
index e957d9d..19c3648 100644
--- a/vdr-skindesigner.spec
+++ b/vdr-skindesigner.spec
@@ -2,7 +2,7 @@
Name: vdr-skindesigner
Version: 1.2.8.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A VDR skinning engine that displays XML based Skins
License: GPLv2+
URL: http://projects.vdr-developer.org/projects/plg-skindesigner
@@ -67,7 +67,8 @@ sed -i -e 's|PCDIR ?= $(PREFIX)/lib/pkgconfig|PCDIR ?= %{_libdir}/pkgconfig|g'
chmod a+x scripts/{temperatures.g2v,vdrstats.default}
%build
-make CFLAGS="%{optflags} -fPIC" CXXFLAGS="%{optflags} -fPIC" %{?_smp_mflags} all
+%{set_build_flags}
+%make_build
%install
# make install would install the themes under /etc, let's not use that
@@ -122,6 +123,9 @@ ldconfig -n %{buildroot}%{_libdir}
%{_includedir}/libskindesignerapi/*
%changelog
+* Thu Aug 27 2020 Martin Gansser <martinkg(a)fedoraproject.org> - 1.2.8.4-3
+- Rebuilt for new VDR API version
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1.2.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years, 2 months
[nvidia-390xx-kmod] Patch for kernel 5.8
by Leigh Scott
commit dd1456160af8d2456e10f098ef2c80fdbee96c68
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Aug 27 14:26:32 2020 +0100
Patch for kernel 5.8
kernel-5.8.patch | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++
nvidia-390xx-kmod.spec | 9 ++++-
2 files changed, 104 insertions(+), 1 deletion(-)
---
diff --git a/kernel-5.8.patch b/kernel-5.8.patch
new file mode 100644
index 0000000..1d32d56
--- /dev/null
+++ b/kernel-5.8.patch
@@ -0,0 +1,96 @@
+diff --git a/kernel/common/inc/nv-linux.h b/kernel/common/inc/nv-linux.h
+index ac5bb95..3d2f0b7 100644
+--- a/kernel/common/inc/nv-linux.h
++++ b/kernel/common/inc/nv-linux.h
+@@ -532,7 +532,11 @@ extern int nv_pat_mode;
+
+ static inline void *nv_vmalloc(unsigned long size)
+ {
++#if defined(NV_VMALLOC_HAS_PGPROT_T_ARG)
+ void *ptr = __vmalloc(size, GFP_KERNEL, PAGE_KERNEL);
++#else
++ void *ptr = __vmalloc(size, GFP_KERNEL);
++#endif
+ if (ptr)
+ NV_MEMDBG_ADD(ptr, size);
+ return ptr;
+diff --git a/kernel/common/inc/nv-mm.h b/kernel/common/inc/nv-mm.h
+index 1270bf3..d2d7657 100644
+--- a/kernel/common/inc/nv-mm.h
++++ b/kernel/common/inc/nv-mm.h
+@@ -29,6 +29,10 @@
+ typedef int vm_fault_t;
+ #endif
+
++#if defined(NV_MM_HAS_MMAP_LOCK)
++#define mmap_sem mmap_lock
++#endif
++
+ /* get_user_pages
+ *
+ * The 8-argument version of get_user_pages was deprecated by commit
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index 7da7505..7793dd6 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -4067,6 +4067,44 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_KTIME_GET_REAL_TS64_PRESENT" "" "functions"
+ ;;
+
++ vmalloc_has_pgprot_t_arg)
++ #
++ # Determine if __vmalloc has the 'pgprot' argument.
++ #
++ # The third argument to __vmalloc, page protection
++ # 'pgprot_t prot', was removed by commit 88dca4ca5a93
++ # (mm: remove the pgprot argument to __vmalloc)
++ # in v5.8-rc1 (2020-06-01).
++ CODE="
++ #include <linux/vmalloc.h>
++
++ void conftest_vmalloc_has_pgprot_t_arg(void) {
++ pgprot_t prot;
++ (void)__vmalloc(0, 0, prot);
++ }"
++
++ compile_check_conftest "$CODE" "NV_VMALLOC_HAS_PGPROT_T_ARG" "" "types"
++
++ ;;
++
++ mm_has_mmap_lock)
++ #
++ # Determine if the 'mm_struct' structure has a 'mmap_lock' field.
++ #
++ # Kernel commit da1c55f1b272 ("mmap locking API: rename mmap_sem
++ # to mmap_lock") replaced the field 'mmap_sem' by 'mmap_lock'
++ # in v5.8-rc1 (2020-06-08).
++ CODE="
++ #include <linux/mm_types.h>
++
++ int conftest_mm_has_mmap_lock(void) {
++ return offsetof(struct mm_struct, mmap_lock);
++ }"
++
++ compile_check_conftest "$CODE" "NV_MM_HAS_MMAP_LOCK" "" "types"
++
++ ;;
++
+ pci_dev_has_skip_bus_pm)
+ #
+ # Determine if skip_bus_pm flag is present in struct pci_dev.
+diff --git a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
+index 63e369f..656db7b 100644
+--- a/kernel/nvidia/nvidia.Kbuild
++++ b/kernel/nvidia/nvidia.Kbuild
+@@ -192,7 +192,9 @@ NV_CONFTEST_TYPE_COMPILE_TESTS += iterate_dir
+ NV_CONFTEST_TYPE_COMPILE_TESTS += kstrtoull
+ NV_CONFTEST_TYPE_COMPILE_TESTS += backlight_properties_type
+ NV_CONFTEST_TYPE_COMPILE_TESTS += proc_ops
++NV_CONFTEST_TYPE_COMPILE_TESTS += vmalloc_has_pgprot_t_arg
+ NV_CONFTEST_TYPE_COMPILE_TESTS += timeval
++NV_CONFTEST_TYPE_COMPILE_TESTS += mm_has_mmap_lock
+ NV_CONFTEST_TYPE_COMPILE_TESTS += kmem_cache_has_kobj_remove_work
+ NV_CONFTEST_TYPE_COMPILE_TESTS += sysfs_slab_unlink
+ NV_CONFTEST_TYPE_COMPILE_TESTS += pci_dev_has_skip_bus_pm
+--
+2.25.1
diff --git a/nvidia-390xx-kmod.spec b/nvidia-390xx-kmod.spec
index fa5675e..3d67dc3 100644
--- a/nvidia-390xx-kmod.spec
+++ b/nvidia-390xx-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-390xx-kmod
Epoch: 3
Version: 390.138
# Taken over by kmodtool
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: NVIDIA 390xx display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -21,6 +21,7 @@ URL: http://www.nvidia.com/
Source11: nvidia-390xx-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: nv-linux-arm2.patch
+Patch2: kernel-5.8.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64 armv7hl
@@ -46,6 +47,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
@@ -58,6 +60,7 @@ for kernel_version in %{?kernel_versions}; do
make V=1 %{?_smp_mflags} \
KERNEL_UNAME="${kernel_version%%___*}" SYSSRC="${kernel_version##*___}" \
IGNORE_CC_MISMATCH=1 IGNORE_XEN_PRESENCE=1 IGNORE_PREEMPT_RT_PRESENCE=1 \
+ NV_EXCLUDE_KERNEL_MODULES=nvidia-uvm \
module
popd
done
@@ -74,6 +77,10 @@ done
%changelog
+* Thu Aug 27 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3:390.138-3
+- Patch for kernel 5.8
+- Exclude nvidia-uvm due to GPL-only symbol 'radix_tree_preloads'
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 3:390.138-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years, 2 months
