nvidia-340xx: update legacy nvidia driver to version 340.106

Signed-off-by: Philip J Perry <phil@elrepo.org>
elrepo · Feb 5, 2018 · 07ff630 · 07ff630
1 parent c297ada
commit 07ff630
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 12 deletions.
diff --git a/nvidia-340xx-kmod/el6/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod/el6/nvidia-340xx-kmod.spec
@@ -5,7 +5,7 @@
 %{!?kversion: %define kversion 2.6.32-573.el6.%{_target_cpu}}
 
 Name:	 %{kmod_name}-kmod
-Version: 340.101
+Version: 340.106
 Release: 1%{?dist}
 Group:	 System Environment/Kernel
 License: Proprietary
@@ -79,6 +79,12 @@ popd
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Feb 02 2018 Philip J Perry <phil@elrepo.org> - 340.106-1.el6.elrepo
+- Updated to version 340.106
+
+* Sat Feb 25 2017 Philip J Perry <phil@elrepo.org> - 340.102-1.el6.elrepo
+- Updated to version 340.102
+
 * Sat Dec 17 2016 Philip J Perry <phil@elrepo.org> - 340.101-1.el6.elrepo
 - Updated to version 340.101
 

diff --git a/nvidia-340xx-kmod/el7/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod/el7/nvidia-340xx-kmod.spec
@@ -5,8 +5,8 @@
 %{!?kversion: %define kversion 3.10.0-693.el7.%{_target_cpu}}
 
 Name:    %{kmod_name}-kmod
-Version: 340.102
-Release: 4.el7_4.elrepo
+Version: 340.106
+Release: 1.el7_4.elrepo
 Group:   System Environment/Kernel
 License: Proprietary
 Summary: NVIDIA OpenGL kernel driver module
@@ -21,7 +21,7 @@ Source0:  ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux
 Source1:  blacklist-nouveau.conf
 Source10: kmodtool-%{kmod_name}-el7.sh
 
-Patch0: legacy340.patch
+# Patch0: legacy340.patch
 
 NoSource: 0
 
@@ -42,7 +42,7 @@ echo "override nvidia * weak-updates/%{kmod_name}" > kmod-%{kmod_name}.conf
 echo "override nvidia-uvm * weak-updates/%{kmod_name}" >> kmod-%{kmod_name}.conf
 sh %{SOURCE0} --extract-only --target nvidiapkg
 
-%patch0 -p1
+# %patch0 -p1
 
 %{__cp} -a nvidiapkg _kmod_build_
 
@@ -83,6 +83,9 @@ done
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Fri Feb 02 2018 Philip J Perry <phil@elrepo.org> - 340.106-1
+- Updated to version 340.106
+
 * Thu Aug 17 2017 Akemi Yagi <toracat@elrepo.org> - 340.102-4
 - Patch to fix compilation issue applied
   [http://elrepo.org/bugs/view.php?id=768]

diff --git a/nvidia-x11-drv-340xx/el6/nvidia-x11-drv-340xx.spec b/nvidia-x11-drv-340xx/el6/nvidia-x11-drv-340xx.spec
@@ -1,6 +1,6 @@
 # Define the Max Xorg version (ABI) that this driver release supports
 # See README.txt, Chapter 2. Minimum Software Requirements or
-# ftp://download.nvidia.com/XFree86/Linux-x86_64/340.101/README/minimumrequirements.html
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/340.106/README/minimumrequirements.html
 %define		max_xorg_ver	1.19.99
 
 %define		nvidialibdir	%{_libdir}/nvidia
@@ -9,7 +9,7 @@
 %define		debug_package	%{nil}
 
 Name:		nvidia-x11-drv-340xx
-Version:	340.101
+Version:	340.106
 Release:	1%{?dist}
 Group:		User Interface/X Hardware Support
 License:	Distributable
@@ -46,6 +46,7 @@ Provides: libGL.so()(64bit)
 # Provides for CUDA
 Provides:	cuda-driver = %{version}
 Provides:	cuda-drivers = %{version}
+Provides:	nvidia-drivers = %{version}
 %endif
 
 # provides desktop-file-install
@@ -460,6 +461,13 @@ fi ||:
 %endif
 
 %changelog
+* Fri Feb 02 2018 Philip J Perry <phil@elrepo.org> - 340.106-1.el6.elrepo
+- Updated to version 340.106
+- Add CUDA provides for nvidia-drivers
+
+* Sat Feb 25 2017 Philip J Perry <phil@elrepo.org> - 340.102-1.el6.elrepo
+- Updated to version 340.102
+
 * Sat Dec 17 2016 Philip J Perry <phil@elrepo.org> - 340.101-1.el6.elrepo
 - Updated to version 340.101
 - Adds support for Xorg 1.19 (Video Driver ABI 23)

diff --git a/nvidia-x11-drv-340xx/el7/nvidia-x11-drv-340xx.spec b/nvidia-x11-drv-340xx/el7/nvidia-x11-drv-340xx.spec
@@ -1,6 +1,6 @@
 # Define the Max Xorg version (ABI) that this driver release supports
 # See README.txt, Chapter 2. Minimum Software Requirements or
-# ftp://download.nvidia.com/XFree86/Linux-x86_64/340.101/README/minimumrequirements.html
+# ftp://download.nvidia.com/XFree86/Linux-x86_64/340.106/README/minimumrequirements.html
 %define		max_xorg_ver	1.19.99
 
 %define		nvidialibdir	%{_libdir}/nvidia
@@ -9,7 +9,7 @@
 %define		debug_package	%{nil}
 
 Name:		nvidia-x11-drv-340xx
-Version:	340.101
+Version:	340.106
 Release:	1%{?dist}
 Group:		User Interface/X Hardware Support
 License:	Distributable
@@ -35,6 +35,7 @@ Provides: libGL.so()(64bit)
 # Provides for CUDA
 Provides:	cuda-driver = %{version}
 Provides:	cuda-drivers = %{version}
+Provides:	nvidia-drivers = %{version}
 
 # provides desktop-file-install
 BuildRequires:	desktop-file-utils
@@ -328,7 +329,7 @@ if [ "$1" -eq "1" ]; then # new install
       cp -p %{_sysconfdir}/X11/nvidia-xorg.conf %{_sysconfdir}/X11/xorg.conf &>/dev/null
     # Disable the nouveau driver
     [ -f %{_sysconfdir}/default/grub ] && \
-      %{__perl} -pi -e 's|(GRUB_CMDLINE_LINUX=".*)"|$1 nouveau\.modeset=0 rd\.driver\.blacklist=nouveau"|g' \
+      %{__perl} -pi -e 's|(GRUB_CMDLINE_LINUX=".*)"|$1 nouveau\.modeset=0 rd\.driver\.blacklist=nouveau plymouth\.ignore-udev"|g' \
         %{_sysconfdir}/default/grub
     if [ -x /usr/sbin/grubby ]; then
       # get installed kernels
@@ -339,7 +340,7 @@ if [ "$1" -eq "1" ]; then # new install
           if [[ "$KERNEL" == "$KABI" && -e "$VMLINUZ" ]]; then
             /usr/bin/dracut --add-drivers nvidia -f /boot/initramfs-$KERNEL.img $KERNEL
             /usr/sbin/grubby --update-kernel="$VMLINUZ" \
-              --args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null
+              --args='nouveau.modeset=0 rd.driver.blacklist=nouveau plymouth.ignore-udev' &>/dev/null
           fi
         done
       done
@@ -360,14 +361,15 @@ if [ "$1" -eq "0" ]; then # uninstall
     if [ -f %{_sysconfdir}/default/grub ]; then
       %{__perl} -pi -e 's|(GRUB_CMDLINE_LINUX=.*) nouveau\.modeset=0|$1|g' %{_sysconfdir}/default/grub
       %{__perl} -pi -e 's|(GRUB_CMDLINE_LINUX=.*) rd\.driver\.blacklist=nouveau|$1|g' %{_sysconfdir}/default/grub
+      %{__perl} -pi -e 's|(GRUB_CMDLINE_LINUX=.*) plymouth\.ignore-udev|$1|g' %{_sysconfdir}/default/grub
     fi
     if [ -x /usr/sbin/grubby ]; then
       # get installed kernels
       for KERNEL in $(rpm -q --qf '%{v}-%{r}.%{arch}\n' kernel); do
         VMLINUZ="/boot/vmlinuz-"$KERNEL
         if [[ -e "$VMLINUZ" ]]; then
           /usr/sbin/grubby --update-kernel="$VMLINUZ" \
-            --remove-args='nouveau.modeset=0 rd.driver.blacklist=nouveau' &>/dev/null
+            --remove-args='nouveau.modeset=0 rd.driver.blacklist=nouveau plymouth.ignore-udev' &>/dev/null
         fi
       done
     fi
@@ -420,6 +422,14 @@ fi ||:
 %{_prefix}/lib/vdpau/libvdpau_nvidia.*
 
 %changelog
+* Fri Feb 02 2018 Philip J Perry <phil@elrepo.org> - 340.106-1
+- Updated to version 340.106
+- Add CUDA provides for nvidia-drivers
+
+* Sat Feb 25 2017 Philip J Perry <phil@elrepo.org> - 340.102-1
+- Updated to version 340.102
+- Use plymouth.ignore-udev to allow text mode booting [David Bell]
+
 * Sat Dec 17 2016 Philip J Perry <phil@elrepo.org> - 340.101-1
 - Updated to version 340.101
 - Adds support for Xorg 1.19 (Video Driver ABI 23)