From 389e9f11651bd092b884e9faa04bb362165355f7 Mon Sep 17 00:00:00 2001 From: Kevin Mittman Date: Fri, 7 Jun 2019 15:18:01 -0700 Subject: [PATCH] Match tech preview --- dkms-nvidia.spec | 397 +++++++++++++++++++++++++++++++++++++---------- 1 file changed, 312 insertions(+), 85 deletions(-) diff --git a/dkms-nvidia.spec b/dkms-nvidia.spec index a4c7818..689f983 100755 --- a/dkms-nvidia.spec +++ b/dkms-nvidia.spec @@ -1,24 +1,27 @@ %global debug_package %{nil} %global dkms_name nvidia +%global _basename kmod-%{dkms_name} +%define _named_version %{driver_branch} -Name: dkms-%{dkms_name} -Version: 460.56 +Name: %{_basename}-%{_named_version} +Version: 430.14 Release: 1%{?dist} Summary: NVIDIA display driver kernel module Epoch: 3 License: NVIDIA License URL: http://www.nvidia.com/object/unix.html # Package is not noarch as it contains pre-compiled binary code -ExclusiveArch: x86_64 +ExclusiveArch: x86_64 ppc64le Source0: %{dkms_name}-kmod-%{version}-x86_64.tar.xz -Source1: %{name}.conf -Source2: dkms-no-weak-modules.conf - +Source1: dkms-%{dkms_name}.conf +Source2: %{dkms_name}-kmod-%{version}-ppc64le.tar.xz BuildRequires: sed -Provides: %{dkms_name}-kmod = %{?epoch:%{epoch}:}%{version} -Requires: %{dkms_name}-kmod-common = %{?epoch:%{epoch}:}%{version} +Provides: %{dkms_name}-kmod = %{?epoch}:%{version} +Obsoletes: dkms-%{dkms-name} < %{?epoch}:%{version} +Conflicts: dkms-%{dkms-name} +Requires: %{dkms_name}-driver = %{?epoch}:%{version} Requires: dkms %description @@ -27,134 +30,358 @@ The modules are rebuilt through the DKMS system when a new kernel or modules become available. %prep -%autosetup -p0 -n %{dkms_name}-kmod-%{version}-x86_64 +%ifarch x86_64 +%setup -q -n %{dkms_name}-kmod-%{version}-x86_64 +cp -f %{SOURCE1} kernel/dkms.conf +%endif +%ifarch ppc64le +%setup -q -T -b 2 -n %{dkms_name}-kmod-%{version}-ppc64le cp -f %{SOURCE1} kernel/dkms.conf +%endif sed -i -e 's/__VERSION_STRING/%{version}/g' kernel/dkms.conf %build %install -# Create empty tree: +# Create empty tree mkdir -p %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ cp -fr kernel/* %{buildroot}%{_usrsrc}/%{dkms_name}-%{version}/ -%if 0%{?fedora} -# Do not enable weak modules support in Fedora (no kABI): -install -p -m 644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/dkms/nvidia.conf -%endif - %post dkms add -m %{dkms_name} -v %{version} -q || : -# Rebuild and make available for the currently running kernel: +# Rebuild and make available for the currently running kernel dkms build -m %{dkms_name} -v %{version} -q || : dkms install -m %{dkms_name} -v %{version} -q --force || : %preun -# Remove all versions from DKMS registry: +# Remove all versions from DKMS registry dkms remove -m %{dkms_name} -v %{version} -q --all || : %files %{_usrsrc}/%{dkms_name}-%{version} -%if 0%{?fedora} -%{_sysconfdir}/dkms/nvidia.conf -%endif %changelog -* Mon Mar 01 2021 Simone Caronni - 3:460.56-1 -- Update to 460.56. +* Wed Oct 17 2018 Simone Caronni - 3:410.66-1 +- Update to 410.66. -* Wed Jan 27 2021 Simone Caronni - 3:460.39-1 -- Update to 460.39. +* Sat Sep 22 2018 Simone Caronni - 3:410.57-1 +- Update to 410.57. -* Thu Jan 7 2021 Simone Caronni - 3:460.32.03-1 -- Update to 460.32.03. +* Wed Aug 22 2018 Simone Caronni - 3:396.54-1 +- Update to 396.54. + +* Sun Aug 19 2018 Simone Caronni - 3:396.51-1 +- Update to 396.51. + +* Fri Jul 20 2018 Simone Caronni - 3:396.45-1 +- Update to 396.45. + +* Fri Jun 01 2018 Simone Caronni - 3:396.24-1 +- Update to 396.24, x86_64 only. + +* Tue May 22 2018 Simone Caronni - 3:390.59-1 +- Update to 390.59. + +* Sat May 18 2019 Simone Caronni - 3:430.14-1 +- Update to 430.14. -* Sun Dec 20 2020 Simone Caronni - 3:460.27.04-1 -- Update to 460.27.04. +* Thu May 09 2019 Simone Caronni - 3:418.74-1 +- Update to 418.74. + +* Sun Mar 24 2019 Simone Caronni - 3:418.56-1 +- Update to 418.56. + +* Fri Feb 22 2019 Simone Caronni - 3:418.43-1 +- Update to 418.43. - Trim changelog. -- Do not enable weak module support on Fedora. -* Sun Nov 29 2020 Simone Caronni - 3:455.45.01-2 -- Add temporary patch for memory allocation: - https://forums.developer.nvidia.com/t/455-23-04-page-allocation-failure-in-kernel-module-at-random-points/155250 +* Wed Feb 06 2019 Simone Caronni - 3:418.30-1 +- Update to 418.30. -* Wed Nov 18 2020 Simone Caronni - 3:455.45.01-1 -- Update to 455.45.01. +* Sun Feb 03 2019 Simone Caronni - 3:415.27-2 +- Do not require nvidia-driver, require nvidia-kmod-common. -* Mon Nov 02 2020 Simone Caronni - 3:455.38-1 -- Update to 455.38. +* Thu Jan 17 2019 Simone Caronni - 3:415.27-1 +- Update to 415.27. -* Mon Oct 12 2020 Simone Caronni - 3:455.28-1 -- Update to 455.28. +* Thu Dec 20 2018 Simone Caronni - 3:415.25-1 +- Update to 415.25. -* Tue Oct 06 2020 Simone Caronni - 3:450.80.02-1 -- Update to 450.80.02. +* Fri Dec 14 2018 Simone Caronni - 3:415.23-1 +- Update to 415.23. -* Thu Aug 20 2020 Simone Caronni - 3:450.66-1 -- Update to 450.66. +* Sun Dec 09 2018 Simone Caronni - 3:415.22-1 +- Update to 415.22. -* Fri Jul 10 2020 Simone Caronni - 3:450.57-1 -- Update to 450.57. +* Thu Nov 22 2018 Simone Caronni - 3:415.18-1 +- Update to 415.18. -* Thu Jun 25 2020 Simone Caronni - 3:440.100-1 -- Update to 440.100. +* Mon Nov 19 2018 Simone Caronni - 3:410.78-1 +- Update to 410.78. -* Thu Apr 09 2020 Simone Caronni - 3:440.82-1 -- Update to 440.82. +* Fri Oct 26 2018 Simone Caronni - 3:410.73-1 +- Update to 410.73. -* Fri Feb 28 2020 Simone Caronni - 3:440.64-1 -- Update to 440.64. +* Wed Oct 17 2018 Simone Caronni - 3:410.66-1 +- Update to 410.66. -* Tue Feb 04 2020 Simone Caronni - 3:440.59-1 -- Update to 440.59. +* Sat Sep 22 2018 Simone Caronni - 3:410.57-1 +- Update to 410.57. -* Sat Dec 14 2019 Simone Caronni - 3:440.44-1 -- Update to 440.44. +* Wed Aug 22 2018 Simone Caronni - 3:396.54-1 +- Update to 396.54. -* Sat Nov 30 2019 Simone Caronni - 3:440.36-1 -- Update to 440.36. +* Sun Aug 19 2018 Simone Caronni - 3:396.51-1 +- Update to 396.51. -* Sat Nov 09 2019 Simone Caronni - 3:440.31-1 -- Update to 440.31. +* Fri Jul 20 2018 Simone Caronni - 3:396.45-1 +- Update to 396.45. -* Thu Oct 17 2019 Simone Caronni - 3:440.26-1 -- Update to 440.26. +* Fri Jun 01 2018 Simone Caronni - 3:396.24-1 +- Update to 396.24, x86_64 only. -* Tue Sep 03 2019 Simone Caronni - 3:435.21-1 -- Update to 435.21. +* Tue May 22 2018 Simone Caronni - 3:390.59-1 +- Update to 390.59. -* Thu Aug 22 2019 Simone Caronni - 3:435.17-1 -- Update to 435.17. +* Tue Apr 03 2018 Simone Caronni - 3:390.48-1 +- Update to 390.48. -* Wed Jul 31 2019 Simone Caronni - 3:430.40-1 -- Update to 430.40. +* Wed Mar 21 2018 Simone Caronni - 3:390.42-2 +- Re-add kernel 4.15 patch. -* Fri Jul 12 2019 Simone Caronni - 3:430.34-1 -- Update to 430.34. +* Thu Mar 15 2018 Simone Caronni - 3:390.42-1 +- Update to 390.42. -* Wed Jun 12 2019 Simone Caronni - 3:430.26-1 -- Update to 430.26. +* Tue Feb 27 2018 Simone Caronni - 3:390.25-3 +- Align Epoch with the other packages. -* Sat May 18 2019 Simone Caronni - 3:430.14-1 -- Update to 430.14. +* Wed Feb 21 2018 Simone Caronni - 2:390.25-2 +- Add kernel 4.15 patch. -* Thu May 09 2019 Simone Caronni - 3:418.74-1 -- Update to 418.74. +* Tue Jan 30 2018 Simone Caronni - 2:390.25-1 +- Update to 390.25. -* Sun Mar 24 2019 Simone Caronni - 3:418.56-1 -- Update to 418.56. +* Fri Jan 19 2018 Simone Caronni - 2:390.12-1 +- Update to 390.12. -* Fri Feb 22 2019 Simone Caronni - 3:418.43-1 -- Update to 418.43. -- Trim changelog. +* Tue Nov 28 2017 Simone Caronni - 2:387.34-1 +- Update to 387.34. -* Wed Feb 06 2019 Simone Caronni - 3:418.30-1 -- Update to 418.30. +* Tue Oct 31 2017 Simone Caronni - 2:387.22-1 +- Update to 387.22. -* Sun Feb 03 2019 Simone Caronni - 3:415.27-2 -- Do not require nvidia-driver, require nvidia-kmod-common. +* Mon Oct 09 2017 Simone Caronni - 2:387.12-2 +- Ignore mismatching GCC version when compiling, useful when the distribution is + not yet released and compilers are being updated. -* Thu Jan 17 2019 Simone Caronni - 3:415.27-1 -- Update to 415.27. +* Thu Oct 05 2017 Simone Caronni - 2:387.12-1 +- Update to 387.12. + +* Fri Sep 22 2017 Simone Caronni - 2:384.90-1 +- Update to 384.90. + +* Wed Aug 30 2017 Simone Caronni - 2:384.69-1 +- Update to 384.69. + +* Tue Jul 25 2017 Simone Caronni - 2:384.59-1 +- Update to 384.59. + +* Thu May 11 2017 Simone Caronni - 2:381.22-2 +- Add kernel 4.11 patch. + +* Wed May 10 2017 Simone Caronni - 2:381.22-1 +- Update to 381.22. + +* Thu Apr 13 2017 Simone Caronni - 2:381.09-2 +- Add kernel 4.11 patch. + +* Fri Apr 07 2017 Simone Caronni - 2:381.09-1 +- Update to 381.09. +- Remove kernel 4.10 patch. + +* Thu Feb 23 2017 Simone Caronni - 2:378.13-2 +- Update 4.10 patch. + +* Wed Feb 15 2017 Simone Caronni - 2:378.13-1 +- Update to 378.13. + +* Wed Jan 25 2017 Simone Caronni - 2:378.09-2 +- Add kernel 4.10rc4 patch. + +* Thu Jan 19 2017 Simone Caronni - 2:378.09-1 +- Update to 378.09. + +* Thu Dec 15 2016 Simone Caronni - 2:375.26-1 +- Update to 375.26. + +* Sat Nov 19 2016 Simone Caronni - 2:375.20-1 +- Update to 375.20. + +* Sat Oct 22 2016 Simone Caronni - 2:375.10-1 +- Update to 375.10. + +* Fri Sep 09 2016 Simone Caronni - 2:370.28-1 +- Update to 370.28. + +* Wed Aug 17 2016 Simone Caronni - 2:370.23-1 +- Update to 370.23. + +* Fri Jul 22 2016 Simone Caronni - 2:367.35-1 +- Update to 367.35. + +* Mon Jun 13 2016 Simone Caronni - 2:367.27-1 +- Update to 367.27. + +* Thu May 26 2016 Simone Caronni - 2:367.18-1 +- Update to 367.18. +- Fix module build (thanks Artem). + +* Mon May 02 2016 Simone Caronni - 2:364.19-1 +- Update to 364.19. + +* Fri Apr 08 2016 Simone Caronni - 2:364.15-1 +- Update to 364.15. + +* Tue Mar 22 2016 Simone Caronni - 2:364.12-1 +- Update to 364.12. + +* Tue Feb 09 2016 Simone Caronni - 2:361.28-1 +- Update to 361.28. + +* Thu Jan 14 2016 Simone Caronni - 2:361.18-1 +- Update to 361.18. + +* Wed Jan 06 2016 Simone Caronni - 2:361.16-1 +- Update to 361.16. +- Remove ARM (Carma, Kayla) support. + +* Wed Dec 23 2015 Simone Caronni - 2:358.16-2 +- Adjust DKMS config file for kernel source detection (thanks Daniel Miranda). + +* Fri Nov 20 2015 Simone Caronni - 2:358.16-1 +- Update to 358.16. + +* Tue Oct 13 2015 Simone Caronni - 2:358.09-1 +- Update to 358.09, new nvidia-modeset module. + +* Tue Sep 01 2015 Simone Caronni - 2:355.11-1 +- Update to 355.11. + +* Tue Aug 04 2015 Simone Caronni - 2:355.06-1 +- Update to 355.06, use new kernel module build mechanism. +- Remove multi nvidia modules and frontend configuration as it's no longer + supported. +- Move back to extra/nvidia module location for consistency. + +* Wed Jul 29 2015 Simone Caronni - 2:352.30-1 +- Update to 352.30. + +* Wed Jun 17 2015 Simone Caronni - 2:352.21-1 +- Update to 352.21. + +* Tue May 19 2015 Simone Caronni - 2:352.09-1 +- Update to 352.09. + +* Wed May 13 2015 Simone Caronni - 2:346.72-1 +- Update to 346.72. + +* Tue Apr 07 2015 Simone Caronni - 2:346.59-1 +- Update to 346.59. +- Removed unused patch. + +* Thu Mar 12 2015 Simone Caronni - 2:346.47-2 +- Add patch for kernel 4.0. + +* Wed Feb 25 2015 Simone Caronni - 2:346.47-1 +- Update to 346.47. +- Removed upstream patch. + +* Thu Jan 29 2015 Simone Caronni - 2:346.35-2 +- Add kernel patch for 3.18. + +* Sat Jan 17 2015 Simone Caronni - 2:346.35-1 +- Update to 346.35. + +* Tue Dec 09 2014 Simone Caronni - 2:346.22-1 +- Update to 346.22. + +* Fri Nov 14 2014 Simone Caronni - 2:346.16-1 +- Update to 346.16. +- UVM kernel module is gone on i*86. + +* Wed Oct 01 2014 Simone Caronni - 2:343.22-2 +- Attempt building not only if Xen is enabled but also if RT is. + +* Mon Sep 22 2014 Simone Caronni - 2:343.22-1 +- Update to 343.22. + +* Thu Aug 07 2014 Simone Caronni - 2:343.13-1 +- Update to 343.13. + +* Tue Jul 08 2014 Simone Caronni - 2:340.24-1 +- Update to 340.24. + +* Mon Jun 09 2014 Simone Caronni - 2:340.17-1 +- Update to 340.17. + +* Mon Jun 02 2014 Simone Caronni - 2:337.25-1 +- Update to 337.25. + +* Tue May 06 2014 Simone Caronni - 2:337.19-1 +- Update to 337.19. + +* Tue Apr 08 2014 Simone Caronni - 2:337.12-1 +- Update to 337.12. + +* Tue Mar 04 2014 Simone Caronni - 2:334.21-1 +- Update to 334.21, update patch. + +* Tue Feb 18 2014 Simone Caronni - 2:334.16-2 +- Add kernel 3.14 patch. + +* Sat Feb 08 2014 Simone Caronni - 2:334.16-1 +- Update to 334.16. + +* Tue Jan 14 2014 Simone Caronni - 2:331.38-1 +- Update to 331.38. +- Create separate DKMS configuration file for multiple kernel modules. + +* Tue Dec 03 2013 Simone Caronni - 2:331.20-3 +- Move kernel modules under /kernel/drivers/video as the original Nvidia DKMS + settings. + +* Wed Nov 13 2013 Simone Caronni - 2:331.20-2 +- Fix version in dkms.conf file. + +* Thu Nov 07 2013 Simone Caronni - 2:331.20-1 +- Update to 331.20. +- Removed upstreamed patch. + +* Mon Nov 04 2013 Simone Caronni - 2:331.17-1 +- Updated to 331.17. +- Use official patch from Nvidia for 3.11+ kernels. +- Added support for multiple kernel modules along with single one. The single + one is loaded by default by X.org (typical desktop usage). For all other CUDA + specific settings the separate modules can be loaded. + +* Fri Oct 04 2013 Simone Caronni - 2:331.13-1 +- Update to 331.13. + +* Mon Sep 09 2013 Simone Caronni - 2:325.15-1 +- Update to 325.15. + +* Wed Aug 21 2013 Simone Caronni - 2:319.49-1 +- Updated to 319.49. +- Remove RHEL 5 tags. +- Remove patch for kernel 3.10, add patch for kernel 3.11. + +* Mon Jul 29 2013 Simone Caronni - 2:319.32-3 +- Add patch for kernel 3.10. + +* Wed Jul 03 2013 Simone Caronni - 2:319.32-2 +- Add armv7hl support. + +* Fri May 24 2013 Simone Caronni - 1:319.32-1 +- Update to 319.32.