mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-09 00:07:57 +03:00
x11-drivers/nvidia-drivers: fixup postinst messages spacing
There was a few missing ewarn/elog to space out blocks in case of multiple messages, and furthermore these did not seem(?) to work anymore so switch them to \n to ensure a newline. Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
This commit is contained in:
Ionen Wolkens
parent
2b7260cf90
commit
c5a576f98c
@ -431,7 +431,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -441,13 +441,11 @@ pkg_postinst() {
|
||||
fi
|
||||
fi
|
||||
|
||||
ewarn
|
||||
ewarn "Be warned/reminded that the 390.xx branch reached end-of-life and"
|
||||
ewarn "\nBe warned/reminded that the 390.xx branch reached end-of-life and"
|
||||
ewarn "NVIDIA is no longer fixing issues (including security). Free to keep"
|
||||
ewarn "using (for now) but it is recommended to either switch to nouveau or"
|
||||
ewarn "replace hardware. Will be kept in-tree while possible, but expect it"
|
||||
ewarn "to be removed likely in late 2027 or earlier if major issues arise."
|
||||
ewarn
|
||||
ewarn "Note that there is no plans to patch in support for kernels branches"
|
||||
ewarn "\nNote that there is no plans to patch in support for kernels branches"
|
||||
ewarn "newer than 6.1.x which will be supported upstream until December 2026."
|
||||
}
|
||||
|
||||
@ -444,7 +444,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -455,16 +455,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -477,13 +475,11 @@ pkg_postinst() {
|
||||
ewarn "[2] https://wiki.gentoo.org/wiki/Nouveau"
|
||||
fi
|
||||
|
||||
ewarn
|
||||
ewarn "Be warned/reminded that the 470.xx branch reached end-of-life and"
|
||||
ewarn "\nBe warned/reminded that the 470.xx branch reached end-of-life and"
|
||||
ewarn "NVIDIA is no longer fixing issues (including security). Free to keep"
|
||||
ewarn "using (for now) but it is recommended to either switch to nouveau or"
|
||||
ewarn "replace hardware. Will be kept in-tree while possible, but expect it"
|
||||
ewarn "to be removed likely in late 2027 or earlier if major issues arise."
|
||||
ewarn
|
||||
ewarn "Note that there is no plans to patch in support for kernels branches"
|
||||
ewarn "\nNote that there is no plans to patch in support for kernels branches"
|
||||
ewarn "newer than 6.6.x which will be supported upstream until December 2026."
|
||||
}
|
||||
|
||||
@ -523,7 +523,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -534,16 +534,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -557,19 +555,16 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, be warned it is experimental"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, be warned it is experimental"
|
||||
ewarn "and only for modern GPUs (e.g. GTX 1650+). Try to disable if run into issues."
|
||||
ewarn "Please also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "With USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
|
||||
elog "\nWith USE=wayland, this version of ${PN} sets nvidia-drm.modeset=1"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. This feature is considered"
|
||||
elog "experimental but is required for wayland."
|
||||
elog
|
||||
elog "If you experience issues, either disable wayland or edit nvidia.conf."
|
||||
elog "\nIf you experience issues, either disable wayland or edit nvidia.conf."
|
||||
elog "Of note, may possibly cause issues with SLI and Reverse PRIME."
|
||||
fi
|
||||
}
|
||||
|
||||
@ -537,7 +537,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -548,16 +548,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -571,15 +569,13 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
|
||||
ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "Note that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "\nNote that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. *If* experience issues,"
|
||||
elog "either disable wayland or edit nvidia.conf."
|
||||
fi
|
||||
|
||||
@ -537,7 +537,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -548,16 +548,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -571,15 +569,13 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
|
||||
ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "Note that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "\nNote that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. *If* experience issues,"
|
||||
elog "either disable wayland or edit nvidia.conf."
|
||||
fi
|
||||
|
||||
@ -542,7 +542,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -553,16 +553,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -576,15 +574,13 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
|
||||
ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "Note that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "\nNote that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. *If* experience issues,"
|
||||
elog "either disable wayland or edit nvidia.conf."
|
||||
fi
|
||||
|
||||
@ -542,7 +542,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -553,16 +553,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -576,15 +574,13 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
|
||||
ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "Note that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "\nNote that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. *If* experience issues,"
|
||||
elog "either disable wayland or edit nvidia.conf."
|
||||
fi
|
||||
|
||||
@ -541,7 +541,7 @@ pkg_postinst() {
|
||||
|
||||
if [[ -r /proc/driver/nvidia/version &&
|
||||
$(</proc/driver/nvidia/version) != *" ${PV} "* ]]; then
|
||||
ewarn "Currently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "\nCurrently loaded NVIDIA modules do not match the newly installed"
|
||||
ewarn "libraries and may prevent launching GPU-accelerated applications."
|
||||
if use modules; then
|
||||
ewarn "Easiest way to fix this is normally to reboot. If still run into issues"
|
||||
@ -552,16 +552,14 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if [[ $(</proc/cmdline) == *slub_debug=[!-]* ]]; then
|
||||
ewarn "Detected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "\nDetected that the current kernel command line is using 'slub_debug=',"
|
||||
ewarn "this may lead to system instability/freezes with this version of"
|
||||
ewarn "${PN}. Bug: https://bugs.gentoo.org/796329"
|
||||
fi
|
||||
|
||||
if [[ -v NV_LEGACY_MASK ]]; then
|
||||
ewarn
|
||||
ewarn "***WARNING***"
|
||||
ewarn
|
||||
ewarn "You are installing a version of ${PN} known not to work"
|
||||
ewarn "\n***WARNING***"
|
||||
ewarn "\nYou are installing a version of ${PN} known not to work"
|
||||
ewarn "with a GPU of the current system. If unwanted, add the mask:"
|
||||
if [[ -d ${EROOT}/etc/portage/package.mask ]]; then
|
||||
ewarn " echo '${NV_LEGACY_MASK}' > ${EROOT}/etc/portage/package.mask/${PN}"
|
||||
@ -575,15 +573,13 @@ pkg_postinst() {
|
||||
fi
|
||||
|
||||
if use kernel-open && [[ ! -v NV_HAD_KERNEL_OPEN ]]; then
|
||||
ewarn
|
||||
ewarn "Open source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "\nOpen source variant of ${PN} was selected, note that it requires"
|
||||
ewarn "Turing/Ampere+ GPUs (aka GTX 1650+). Try disabling if run into issues."
|
||||
ewarn "Also see: ${EROOT}/usr/share/doc/${PF}/html/kernel_open.html"
|
||||
fi
|
||||
|
||||
if use wayland && use modules && [[ ! -v NV_HAD_WAYLAND ]]; then
|
||||
elog
|
||||
elog "Note that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "\nNote that with USE=wayland, nvidia-drm.modeset=1 will be enabled"
|
||||
elog "in '${EROOT}/etc/modprobe.d/nvidia.conf'. *If* experience issues,"
|
||||
elog "either disable wayland or edit nvidia.conf."
|
||||
fi
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user