commit: aefba1ed1e6cd2be0caa41abb600b0a492499424 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Mon Sep 30 19:25:45 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Mon Sep 30 19:30:14 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aefba1ed
x11-drivers/nvidia-drivers: fix build with USE=-modules At same time update/shorten comment a bit, esp. to mention that it may not be included without initramfs regen and this is more of a best effort solution (thankfully *most* users would include neither modules on an initramfs and it wouldn't matter). Fixes: dacc7d5a54fa46a732fd358a0a771eb06b6aeeb0 Closes: https://bugs.gentoo.org/940564 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild | 13 +++++++------ .../nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild | 13 +++++++------ .../nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild | 13 +++++++------ .../nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild | 13 +++++++------ .../nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild | 13 +++++++------ x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild | 13 +++++++------ x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild | 13 +++++++------ .../nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild | 13 +++++++------ 8 files changed, 56 insertions(+), 48 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild index 9de2db703e7e..eb7f7c538b20 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.157.ebuild @@ -401,12 +401,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild index 901fcedc63b3..2d1290262b0b 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.256.02-r1.ebuild @@ -388,12 +388,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild index e799f517bebc..16f64f83801f 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05-r1.ebuild @@ -452,12 +452,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild index d547a90fb2f7..895d1216ea02 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.183.01-r1.ebuild @@ -452,12 +452,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild index 7b1df6278314..d38e79b6dd1a 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.107.02-r1.ebuild @@ -443,12 +443,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild index 3f80d1a64cc2..09d99013c890 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.120.ebuild @@ -442,12 +442,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild index 7c967cc422fc..3d6eb1baaf8d 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-550.40.75.ebuild @@ -445,12 +445,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() { diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild index 2027543207fe..f348c8169992 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-560.35.03-r1.ebuild @@ -448,12 +448,13 @@ documentation that is installed alongside this README." 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 does not use /etc/modprobe.d if hostonly=no, but want to make sure + # our settings are used for bug 932781#c8 and nouveau blacklist if either + # modules are included (however, just best-effort without initramfs regen) + if use modules; then + echo "install_items+=\" ${EPREFIX}/etc/modprobe.d/nvidia.conf \"" >> \ + "${ED}"/usr/lib/dracut/dracut.conf.d/10-${PN}.conf || die + fi } pkg_preinst() {
