x11-drivers/nvidia-drivers : include nvidia.conf in dracut always (https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/nvidia-drivers?id=dacc7d5a54fa46a732fd358a0a771eb06b6aeeb0)

7 files changed, 25 insertions, 4 deletions

diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r10 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11
index b0e6e823..7dc4bc80 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r10
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.157-r11
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=3
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/390.157/NVIDIA-Linux-x86_64-390.157.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.157.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.157.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=091223e6ffc2ec54a76b4035f36276a0
+_md5_=697863d60b2a71b9c65257e154aadd8a
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
index 15836271..a16a2312 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-470.256.02-r3
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=4
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/470.256.02/NVIDIA-Linux-x86_64-470.256.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-470.256.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-470.256.02.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=70de39a0fba000e2c2ef9fe19db0bcfe
+_md5_=6bde69ef7596f95db75de569139f846f
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r2 b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r3
index 15568340..b6422f54 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r2
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-550.107.02-r3
@@ -14,4 +14,4 @@ RESTRICT=strip
 SLOT=5
 SRC_URI=https://download.nvidia.com/XFree86/Linux-x86_64/550.107.02/NVIDIA-Linux-x86_64-550.107.02.run https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-550.107.02.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-550.107.02.tar.bz2
 _eclasses_=desktop	3a72ffe0d8e1dd73af3a1c8c15a59fed	flag-o-matic	f14aba975c94ccaa9f357a27e3b17ffe	multilib	b2a329026f2e404e9e371097dda47f96	multiprocessing	1e32df7deee68372153dca65f4a7c21f	readme.gentoo-r1	b045f3acf546393ab6b3170781875358	systemd	54bd206bb5c4efac6ae28b6b006713b0	toolchain-funcs	d3d42b22a610ce81c267b644bcec9b87	unpacker	fb4b84181244b3b9990fa0bf40232dd2	user-info	9951b1a0e4f026d16c33a001fd2d5cdf
-_md5_=1472d5f5a218447aed41a0fa0de056be
+_md5_=afe4bbbf8f25eede2301ac71be036c42
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f288f480..9d2b509f 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -85,7 +85,7 @@ virtual/tmpfiles 1.314.1337-r1: Virtual to select between different tmpfiles.d h
 virtual/udev 314.1337-r1: Virtual to select between different udev daemon providers
 www-client/ungoogled-chromium 129.0.6668.58: Modifications to Chromium for removing Google integration and enhancing privacy
 x11-base/xorg-drivers 21.1-r100: Meta package containing deps on all xorg drivers (dummy package)
-x11-drivers/nvidia-drivers 390.157-r10 470.256.02-r2 550.107.02-r2: NVIDIA Accelerated Graphics Driver
+x11-drivers/nvidia-drivers 390.157-r11 470.256.02-r3 550.107.02-r3: NVIDIA Accelerated Graphics Driver
 x11-libs/gtk+ 2.24.33-r6 3.24.41-r6: Gimp ToolKit +
 x11-misc/nvidia-prime 314: NVIDIA Prime Render Offload configuration and utilities
 x11-misc/nvidia-settings 390.157-r7 470.256.02 550.107.02-r1: NVIDIA Linux X11 Settings Utility
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r10.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild
index 0a584315..222f9a18 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r10.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157-r11.ebuild
@@ -307,6 +307,13 @@ documentation that is installed alongside this README."
 	# manually if need others or addwrite)
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl"'
+
+	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
+	# to ensure that the nouveau blacklist is applied
+	# https://github.com/dracut-ng/dracut-ng/issues/674
+	# https://bugs.gentoo.org/932781
+	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
 }
 
 _dracut_initramfs_regen() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
index ff22d171..822d7180 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r3.ebuild
@@ -302,6 +302,13 @@ documentation that is installed alongside this README."
 	# ebuilds should handle manually if need others or addwrite)
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/char"'
+
+	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
+	# to ensure that the nouveau blacklist is applied
+	# https://github.com/dracut-ng/dracut-ng/issues/674
+	# https://bugs.gentoo.org/932781
+	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
 }
 
 _dracut_initramfs_regen() {
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r2.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r3.ebuild
index bad49990..001889c6 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r2.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r3.ebuild
@@ -322,6 +322,13 @@ documentation that is installed alongside this README."
 	# ebuilds should handle manually if need others or addwrite)
 	insinto /etc/sandbox.d
 	newins - 20nvidia <<<'SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-caps:/dev/char"'
+
+	# Dracut does not include /etc/modprobe.d if hostonly=no, but we do need this
+	# to ensure that the nouveau blacklist is applied
+	# https://github.com/dracut-ng/dracut-ng/issues/674
+	# https://bugs.gentoo.org/932781
+	echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \
+		"${ED}/usr/lib/dracut/dracut.conf.d/10-${PN}.conf" || die
 }
 
 _dracut_initramfs_regen() {