From 071b0fbac2e23cbd6cf924dbc647e91345548f52 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 27 Aug 2020 20:33:36 +0100 Subject: [PATCH 1/6] 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 From 52e2c759f2f2dd20cd8f3fd3023473e122b6e80b Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Fri, 28 Aug 2020 13:31:13 +0100 Subject: [PATCH 2/6] Install the systemd power management files --- xorg-x11-drv-nvidia.spec | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 44129c5..f70097e 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -20,7 +20,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 Version: 450.66 -Release: 1%{?dist} +Release: 2%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -40,7 +40,11 @@ Source15: rhel_nvidia.conf ExclusiveArch: x86_64 i686 -Buildrequires: systemd +%if 0%{?fedora} +BuildRequires: systemd-rpm-macros +%else +BuildRequires: systemd +%endif Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -341,9 +345,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/ +# Systemd units and script for suspending/resuming +install -p -m 0644 nvidia-hibernate.service nvidia-resume.service nvidia-suspend.service %{buildroot}%{_unitdir} +install -p -m 0755 nvidia-sleep.sh %{buildroot}%{_bindir} %pre if [ "$1" -eq "1" ]; then @@ -353,6 +357,9 @@ if [ "$1" -eq "1" ]; then fi %post +%systemd_post nvidia-hibernate.service +%systemd_post nvidia-resume.service +%systemd_post nvidia-suspend.service if [ "$1" -eq "1" ]; then %{_grubby} --remove-args='nomodeset' --args='%{_dracutopts}' &>/dev/null sed -i -e 's/GRUB_CMDLINE_LINUX="/GRUB_CMDLINE_LINUX="%{_dracutopts} /g' /etc/default/grub @@ -380,6 +387,9 @@ fi %ldconfig_scriptlets cuda-libs %preun +%systemd_preun nvidia-hibernate.service +%systemd_preun nvidia-resume.service +%systemd_preun nvidia-suspend.service if [ "$1" -eq "0" ]; then %{_grubby} --remove-args='%{_dracutopts}' &>/dev/null sed -i -e 's/%{_dracutopts} //g' /etc/default/grub @@ -387,6 +397,10 @@ if [ "$1" -eq "0" ]; then [ -f %{_sysconfdir}/X11/xorg.conf ] && mv %{_sysconfdir}/X11/xorg.conf %{_sysconfdir}/X11/xorg.conf.nvidia_uninstalled &>/dev/null fi ||: +%postun +%systemd_postun nvidia-hibernate.service +%systemd_postun nvidia-resume.service +%systemd_postun nvidia-suspend.service %files %license nvidiapkg/LICENSE @@ -394,7 +408,10 @@ fi ||: %doc nvidiapkg/README.txt %doc nvidiapkg/nvidia-application-profiles-%{version}-rc %doc nvidiapkg/html -%doc nvidiapkg/samples +%{_bindir}/nvidia-sleep.sh +%{_unitdir}/nvidia-hibernate.service +%{_unitdir}/nvidia-resume.service +%{_unitdir}/nvidia-suspend.service %dir %{_alternate_dir} %{_alternate_dir}/alternate-install-present %{_datadir}/glvnd/egl_vendor.d/10_nvidia.json @@ -504,6 +521,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Fri Aug 28 2020 Leigh Scott - 3:450.66-2 +- Install the systemd power management files + * Tue Aug 18 2020 Leigh Scott - 3:450.66-1 - Update to 450.66 release From e832a4ed31f259c37eac1e71682a53b8fcda9609 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 17 Sep 2020 21:34:27 +0100 Subject: [PATCH 3/6] Update to 455.23.04 beta --- sources | 2 +- xorg-x11-drv-nvidia.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 10dae0a..cc7faf3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NVIDIA-Linux-x86_64-450.66.run) = d4408cf2274602b7ee28f1056b8875468e8b9dae9f9e2dd8fe2dc505cbcdbb76eff2e2182252b8d5182008046ed5ca33c2fdc15d46e4c854b7ca46325724bc67 +SHA512 (NVIDIA-Linux-x86_64-455.23.04.run) = 96e8267ea76bf42f0c8be67d27b4d2a6f180cbea9348feb19c313805dc7957a945992d11ea4a1233d7cf96c75254b717d48153db0fe6aed8146bffd041f50a6e diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index f70097e..f0c9fd4 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -19,8 +19,8 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 450.66 -Release: 2%{?dist} +Version: 455.23.04 +Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards License: Redistributable, no modification permitted @@ -521,6 +521,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Thu Sep 17 2020 Leigh Scott - 3:455.23.04-1 +- Update to 455.23.04 beta + * Fri Aug 28 2020 Leigh Scott - 3:450.66-2 - Install the systemd power management files From b7400d7c2f81bcf31ca5432d282f23051ebba629 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 7 Oct 2020 20:20:44 +0100 Subject: [PATCH 4/6] Update to 455.28 release --- sources | 2 +- xorg-x11-drv-nvidia.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index cc7faf3..d20fea8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NVIDIA-Linux-x86_64-455.23.04.run) = 96e8267ea76bf42f0c8be67d27b4d2a6f180cbea9348feb19c313805dc7957a945992d11ea4a1233d7cf96c75254b717d48153db0fe6aed8146bffd041f50a6e +SHA512 (NVIDIA-Linux-x86_64-455.28.run) = 1456ccf29461816ee4a7cdfabe8b5a3e021d4959e8ea8ee88e83f9058683baee4a2e7d31e02bbb22f1c0c6d25163bd2314385ebde1b8896159b6964878381720 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index f0c9fd4..5c9ae89 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -19,7 +19,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 455.23.04 +Version: 455.28 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -521,6 +521,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Wed Oct 7 2020 Leigh Scott - 3:455.28-1 +- Update to 455.28 release + * Thu Sep 17 2020 Leigh Scott - 3:455.23.04-1 - Update to 455.23.04 beta From 8b41ed39b094309ab2ea5b2792fe259dc810ce64 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 12 Oct 2020 15:57:07 +0100 Subject: [PATCH 5/6] Symlink profile files to fix el issue --- xorg-x11-drv-nvidia.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index 5c9ae89..f094002 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -298,6 +298,8 @@ install -p -m 0644 %{SOURCE5} %{buildroot}%{_alternate_dir} #install the NVIDIA supplied application profiles mkdir -p %{buildroot}%{_datadir}/nvidia install -p -m 0644 nvidia-application-profiles-%{version}-{rc,key-documentation} %{buildroot}%{_datadir}/nvidia +ln -s nvidia-application-profiles-%{version}-rc %{buildroot}%{_datadir}/nvidia/nvidia-application-profiles-rc +ln -s nvidia-application-profiles-%{version}-key-documentation %{buildroot}%{_datadir}/nvidia/nvidia-application-profiles-key-documentation #Install the Xorg configuration files mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d @@ -434,7 +436,7 @@ fi ||: %{_libdir}/xorg/modules/drivers/nvidia_drv.so #/no_multilib %dir %{_datadir}/nvidia -%{_datadir}/nvidia/nvidia-application-profiles-%{version}-* +%{_datadir}/nvidia/nvidia-application-profiles-* %files kmodsrc %dir %{_datadir}/nvidia-kmod-%{version} From f6d8d3ed1d50d916f61bbcd56c46a3e83b319750 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Thu, 29 Oct 2020 14:15:45 +0000 Subject: [PATCH 6/6] Update to 455.38 release --- sources | 2 +- xorg-x11-drv-nvidia.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/sources b/sources index d20fea8..9cfbf7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NVIDIA-Linux-x86_64-455.28.run) = 1456ccf29461816ee4a7cdfabe8b5a3e021d4959e8ea8ee88e83f9058683baee4a2e7d31e02bbb22f1c0c6d25163bd2314385ebde1b8896159b6964878381720 +SHA512 (NVIDIA-Linux-x86_64-455.38.run) = 0430e201f34ed40afbd393274bedb855a680e1439e52d58435ec5dcfc4037f72dbefa9598af66ffac455af2289df07cfa3b7de92d5e541e6c70c93ebba93b146 diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec index f094002..618cfe9 100644 --- a/xorg-x11-drv-nvidia.spec +++ b/xorg-x11-drv-nvidia.spec @@ -19,7 +19,7 @@ Name: xorg-x11-drv-nvidia Epoch: 3 -Version: 455.28 +Version: 455.38 Release: 1%{?dist} Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards @@ -523,6 +523,9 @@ fi ||: %{_libdir}/libnvidia-encode.so %changelog +* Thu Oct 29 2020 Leigh Scott - 3:455.38-1 +- Update to 455.38 release + * Wed Oct 7 2020 Leigh Scott - 3:455.28-1 - Update to 455.28 release