[xorg-x11-drv-nvidia/f25] Fixup for dracut in fedora
by Nicolas Chauvet
commit ff645a6af3e9f5bd11db3107aa18f1e42628d86c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed May 31 10:09:22 2017 +0200
Fixup for dracut in fedora
xorg-x11-drv-nvidia.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 782ccff..930cdfc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -476,6 +476,7 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%if 0%{?fedora} >= 25
%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%{_dracut_conf_d}/99-nvidia-dracut.conf
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%else
%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
7 years, 6 months
[xorg-x11-drv-nvidia/f25] Update .gitignore
by Nicolas Chauvet
commit 5f286d9e913187ffba67a199673f8344bb29ff8f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed May 31 10:00:21 2017 +0200
Update .gitignore
.gitignore | 36 +++---------------------------------
1 file changed, 3 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d78c0fa..08759ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-358.16.run
-NVIDIA-Linux-x86-358.16.run
-NVIDIA-Linux-x86_64-358.16.run
-/NVIDIA-Linux-armv7l-gnueabihf-367.35.run
-/NVIDIA-Linux-x86-367.35.run
-/NVIDIA-Linux-x86_64-367.35.run
-/NVIDIA-Linux-armv7l-gnueabihf-370.23.run
-/NVIDIA-Linux-x86-370.23.run
-/NVIDIA-Linux-x86_64-370.23.run
-/NVIDIA-Linux-armv7l-gnueabihf-370.28.run
-/NVIDIA-Linux-x86-370.28.run
-/NVIDIA-Linux-x86_64-370.28.run
-/NVIDIA-Linux-x86-375.10.run
-/NVIDIA-Linux-x86_64-375.10.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.10.run
-/NVIDIA-Linux-x86-375.20.run
-/NVIDIA-Linux-x86_64-375.20.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.20.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.26.run
-/NVIDIA-Linux-x86-375.26.run
-/NVIDIA-Linux-x86_64-375.26.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.39.run
-/NVIDIA-Linux-x86-375.39.run
-/NVIDIA-Linux-x86_64-375.39.run
-/NVIDIA-Linux-x86-378.13.run
-/NVIDIA-Linux-x86_64-378.13.run
-/NVIDIA-Linux-armv7l-gnueabihf-378.13.run
-/NVIDIA-Linux-x86-381.09.run
-/NVIDIA-Linux-x86_64-381.09.run
-/NVIDIA-Linux-armv7l-gnueabihf-381.09.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.66.run
-/NVIDIA-Linux-x86-375.66.run
-/NVIDIA-Linux-x86_64-375.66.run
+NVIDIA-Linux-armv7l-gnueabihf-*.run
+NVIDIA-Linux-x86-*.run
+NVIDIA-Linux-x86_64-*.run
7 years, 6 months
[xorg-x11-drv-nvidia] Fixup for dracut in fedora
by Nicolas Chauvet
commit eb72cde6a5269a61b830f89cfa5024a1c8fb5fdc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed May 31 10:09:22 2017 +0200
Fixup for dracut in fedora
xorg-x11-drv-nvidia.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 782ccff..930cdfc 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -476,6 +476,7 @@ fi ||:
%ghost %{_sysconfdir}/X11/xorg.conf.d/nvidia.conf
%if 0%{?fedora} >= 25
%{_datadir}/appdata/xorg-x11-drv-nvidia.metainfo.xml
+%{_dracut_conf_d}/99-nvidia-dracut.conf
%{_datadir}/X11/xorg.conf.d/nvidia.conf
%else
%{_datadir}/X11/xorg.conf.d/00-avoid-glamor.conf
7 years, 6 months
[xorg-x11-drv-nvidia] Update .gitignore
by Nicolas Chauvet
commit ac7a01ab1e45cda4fae613449ca3794a05c7ae7b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed May 31 10:00:21 2017 +0200
Update .gitignore
.gitignore | 36 +++---------------------------------
1 file changed, 3 insertions(+), 33 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d78c0fa..08759ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,3 @@
-NVIDIA-Linux-armv7l-gnueabihf-358.16.run
-NVIDIA-Linux-x86-358.16.run
-NVIDIA-Linux-x86_64-358.16.run
-/NVIDIA-Linux-armv7l-gnueabihf-367.35.run
-/NVIDIA-Linux-x86-367.35.run
-/NVIDIA-Linux-x86_64-367.35.run
-/NVIDIA-Linux-armv7l-gnueabihf-370.23.run
-/NVIDIA-Linux-x86-370.23.run
-/NVIDIA-Linux-x86_64-370.23.run
-/NVIDIA-Linux-armv7l-gnueabihf-370.28.run
-/NVIDIA-Linux-x86-370.28.run
-/NVIDIA-Linux-x86_64-370.28.run
-/NVIDIA-Linux-x86-375.10.run
-/NVIDIA-Linux-x86_64-375.10.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.10.run
-/NVIDIA-Linux-x86-375.20.run
-/NVIDIA-Linux-x86_64-375.20.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.20.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.26.run
-/NVIDIA-Linux-x86-375.26.run
-/NVIDIA-Linux-x86_64-375.26.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.39.run
-/NVIDIA-Linux-x86-375.39.run
-/NVIDIA-Linux-x86_64-375.39.run
-/NVIDIA-Linux-x86-378.13.run
-/NVIDIA-Linux-x86_64-378.13.run
-/NVIDIA-Linux-armv7l-gnueabihf-378.13.run
-/NVIDIA-Linux-x86-381.09.run
-/NVIDIA-Linux-x86_64-381.09.run
-/NVIDIA-Linux-armv7l-gnueabihf-381.09.run
-/NVIDIA-Linux-armv7l-gnueabihf-375.66.run
-/NVIDIA-Linux-x86-375.66.run
-/NVIDIA-Linux-x86_64-375.66.run
+NVIDIA-Linux-armv7l-gnueabihf-*.run
+NVIDIA-Linux-x86-*.run
+NVIDIA-Linux-x86_64-*.run
7 years, 6 months
[xorg-x11-drv-nvidia/f25] Add dracut.conf.d/99-nvidia.conf file
by Nicolas Chauvet
commit 399def30b484bdf7342c04091fb7ab5c9fd88cce
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 30 18:01:38 2017 +0200
Add dracut.conf.d/99-nvidia.conf file
Add dracut.conf.d/99-nvidia.conf file enforcing that the nvidia modules never
get added to the initramfs.
This is necessary because the userspace bits and the kernel modules must
be 100% in sync, otherwise things might break. Normally we build the initrd
before building the dkms / akmod so this issue will only happen if the initrd
somehow gets re-generated afterwards, still this is something which we should
avoid.
Patch from Hans de Goede
99-nvidia-dracut.conf | 3 +++
xorg-x11-drv-nvidia.spec | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/99-nvidia-dracut.conf b/99-nvidia-dracut.conf
new file mode 100644
index 0000000..68b6e93
--- /dev/null
+++ b/99-nvidia-dracut.conf
@@ -0,0 +1,3 @@
+# omit the nvidia driver from the ramdisk, to avoid needing to regenerate
+# the ramdisk on nvidia driver updates
+omit_drivers+=" nvidia-drm "
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a1d67dd..782ccff 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -13,8 +13,10 @@
%global _udevrulesdir %{_prefix}/lib/udev/rules.d/
%global _modprobe_d %{_sysconfdir}/modprobe.d/
%global _dracutopts nouveau.modeset=0 rdblacklist=nouveau
+%global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
%global _grubby /sbin/grubby --grub --update-kernel=ALL
%else #rhel > 6 or fedora
+%global _dracut_conf_d %{_prefix}/lib/dracut.conf.d
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
%if 0%{?rhel} == 7
@@ -31,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -51,6 +53,7 @@ Source12: xorg-x11-drv-nvidia.metainfo.xml
Source13: parse-readme.py
Source14: 60-nvidia-uvm.rules
Source15: nvidia-uvm.conf
+Source16: 99-nvidia-dracut.conf
ExclusiveArch: i686 x86_64 armv7hl
@@ -293,6 +296,10 @@ install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
install -m 0755 -d %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE14} %{buildroot}%{_udevrulesdir}
+# dracut.conf.d file, nvidia modules must never be in the initrd
+install -p -m 0755 -d %{buildroot}%{_dracut_conf_d}/
+install -p -m 0644 %{SOURCE16} %{buildroot}%{_dracut_conf_d}/
+
# Install binaries
install -m 0755 -d %{buildroot}%{_bindir}
install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced} \
@@ -476,8 +483,10 @@ fi ||:
# RHEL6 uses /etc
%if 0%{?rhel} == 6
%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
+%config(noreplace) %{_dracut_conf_d}/99-nvidia-dracut.conf
%else
%{_modprobe_d}/blacklist-nouveau.conf
+%{_dracut_conf_d}/99-nvidia-dracut.conf
%endif
%endif
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
@@ -584,8 +593,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
-* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-4
+* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-5
- Update the triggerin to insert the new cmdline
+- Avoid the nvidia modules to get added to the initramfs - patch by hansg
* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
- Revert 10_nvidia.json rename
7 years, 6 months
[xorg-x11-drv-nvidia/f25] Update the triggerin to insert the new cmdline
by Nicolas Chauvet
commit 4f298a6e53aa44ecaf455d4a8fea793e5c2b8ab5
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 30 16:35:44 2017 +0200
Update the triggerin to insert the new cmdline
xorg-x11-drv-nvidia.spec | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 2833e97..a1d67dd 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -31,7 +31,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -393,7 +393,21 @@ if [ "$1" -eq "1" ]; then
fi || :
%if 0%{?fedora} || 0%{?rhel} >= 7
-%triggerin -- xorg-x11-drv-nvidia < 2:375.66-1
+%triggerin -- xorg-x11-drv-nvidia < 2:375.66-4
+if [ -f %{_sysconfdir}/default/grub ] ; then
+ . %{_sysconfdir}/default/grub
+ if [ -z "${GRUB_CMDLINE_LINUX+x}" ]; then
+ echo -e GRUB_CMDLINE_LINUX=\"%{_dracutopts}\" >> %{_sysconfdir}/default/grub
+ else
+ for i in %{_dracutopts} ; do
+ _has_string=$(echo ${GRUB_CMDLINE_LINUX} | fgrep -c $i)
+ if [ x"$_has_string" = x0 ] ; then
+ GRUB_CMDLINE_LINUX="${GRUB_CMDLINE_LINUX} ${i}"
+ fi
+ done
+ sed -i -e "s/^GRUB_CMDLINE_LINUX=.*/GRUB_CMDLINE_LINUX=\"${GRUB_CMDLINE_LINUX}\"/g" %{_sysconfdir}/default/grub
+ fi
+fi
%{_grubby} --args='%{_dracutopts}' &>/dev/null || :
%endif
@@ -570,6 +584,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-4
+- Update the triggerin to insert the new cmdline
+
* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
- Revert 10_nvidia.json rename
7 years, 6 months
[xorg-x11-drv-nvidia] Add dracut.conf.d/99-nvidia.conf file
by Nicolas Chauvet
commit a7d0bc2457784b1fcad329977cdd2519273e9840
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 30 18:01:38 2017 +0200
Add dracut.conf.d/99-nvidia.conf file
Add dracut.conf.d/99-nvidia.conf file enforcing that the nvidia modules never
get added to the initramfs.
This is necessary because the userspace bits and the kernel modules must
be 100% in sync, otherwise things might break. Normally we build the initrd
before building the dkms / akmod so this issue will only happen if the initrd
somehow gets re-generated afterwards, still this is something which we should
avoid.
Patch from Hans de Goede
99-nvidia-dracut.conf | 3 +++
xorg-x11-drv-nvidia.spec | 14 ++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/99-nvidia-dracut.conf b/99-nvidia-dracut.conf
new file mode 100644
index 0000000..68b6e93
--- /dev/null
+++ b/99-nvidia-dracut.conf
@@ -0,0 +1,3 @@
+# omit the nvidia driver from the ramdisk, to avoid needing to regenerate
+# the ramdisk on nvidia driver updates
+omit_drivers+=" nvidia-drm "
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index a1d67dd..782ccff 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -13,8 +13,10 @@
%global _udevrulesdir %{_prefix}/lib/udev/rules.d/
%global _modprobe_d %{_sysconfdir}/modprobe.d/
%global _dracutopts nouveau.modeset=0 rdblacklist=nouveau
+%global _dracut_conf_d %{_sysconfdir}/dracut.conf.d
%global _grubby /sbin/grubby --grub --update-kernel=ALL
%else #rhel > 6 or fedora
+%global _dracut_conf_d %{_prefix}/lib/dracut.conf.d
%global _modprobe_d %{_prefix}/lib/modprobe.d/
%global _grubby %{_sbindir}/grubby --update-kernel=ALL
%if 0%{?rhel} == 7
@@ -31,7 +33,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 2
Version: 375.66
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -51,6 +53,7 @@ Source12: xorg-x11-drv-nvidia.metainfo.xml
Source13: parse-readme.py
Source14: 60-nvidia-uvm.rules
Source15: nvidia-uvm.conf
+Source16: 99-nvidia-dracut.conf
ExclusiveArch: i686 x86_64 armv7hl
@@ -293,6 +296,10 @@ install -p -m 0644 %{SOURCE6} %{buildroot}%{_modprobe_d}
install -m 0755 -d %{buildroot}%{_udevrulesdir}
install -p -m 0644 %{SOURCE14} %{buildroot}%{_udevrulesdir}
+# dracut.conf.d file, nvidia modules must never be in the initrd
+install -p -m 0755 -d %{buildroot}%{_dracut_conf_d}/
+install -p -m 0644 %{SOURCE16} %{buildroot}%{_dracut_conf_d}/
+
# Install binaries
install -m 0755 -d %{buildroot}%{_bindir}
install -p -m 0755 nvidia-{bug-report.sh,debugdump,smi,cuda-mps-control,cuda-mps-server,xconfig,settings,persistenced} \
@@ -476,8 +483,10 @@ fi ||:
# RHEL6 uses /etc
%if 0%{?rhel} == 6
%config(noreplace) %{_modprobe_d}/blacklist-nouveau.conf
+%config(noreplace) %{_dracut_conf_d}/99-nvidia-dracut.conf
%else
%{_modprobe_d}/blacklist-nouveau.conf
+%{_dracut_conf_d}/99-nvidia-dracut.conf
%endif
%endif
%config %{_sysconfdir}/xdg/autostart/nvidia-settings.desktop
@@ -584,8 +593,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
-* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-4
+* Tue May 30 2017 Nicolas Chauvet <kwizart(a)gmail.com> - 2:375.66-5
- Update the triggerin to insert the new cmdline
+- Avoid the nvidia modules to get added to the initramfs - patch by hansg
* Tue May 30 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2:375.66-3
- Revert 10_nvidia.json rename
7 years, 6 months