gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-06 00:48:18 -07:00
Code Issues Projects Releases Wiki Activity

nvidia-driver.eclass: Fix GPU vs version compatibility check

Browse Source 
- In commit 245f417b53 I replaced
version_compare() with ver_test but failed to properly adjust the check
from the "is at least" return value to its ver_test equivalent. Invert
the test return value for clarity and check for a version mask less than
PV.
- Use lower case for local variable name.
- Fix a comment while there.

Fixes: https://bugs.gentoo.org/701734
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
Tested-by: Kobboi
Signed-off-by: Jeroen Roovers <jer@gentoo.org>
This commit is contained in:
Jeroen Roovers
2019-12-02 11:08:30 +01:00
parent b2e2f09462
commit ab0fb15197
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
eclass/nvidia-driver.eclass
View File

@@ -175,12 +175,12 @@ nvidia-driver_get_mask() {
# @FUNCTION: nvidia-driver_check_gpu
# @DESCRIPTION:
# Prints out a warning if the driver does not work w/ the installed video nvidia_gpu
# Prints out a warning if the driver does not work with the installed GPU
nvidia-driver_check_gpu() {
local NVIDIA_MASK="$(nvidia-driver_get_mask)"
local nvidia_mask="$(nvidia-driver_get_mask)"
if [ -n "${NVIDIA_MASK}" ]; then
if ! ver_test "${NVIDIA_MASK##*-}" -eq "${PV}" ; then
if [ -n "${nvidia_mask}" ]; then
if ver_test "${nvidia_mask##*-}" -lt "${PV}" ; then
ewarn "***** WARNING *****"
ewarn
ewarn "You are currently installing a version of nvidia-drivers that is"
@@ -190,9 +190,9 @@ nvidia-driver_check_gpu() {
ewarn
ewarn "Add the following mask entry to the local package.mask file:"
if [ -d "${ROOT}/etc/portage/package.mask" ]; then
ewarn "echo \"${NVIDIA_MASK}\" > /etc/portage/package.mask/nvidia-drivers"
ewarn "echo \"${nvidia_mask}\" > /etc/portage/package.mask/nvidia-drivers"
else
ewarn "echo \"${NVIDIA_MASK}\" >> /etc/portage/package.mask"
ewarn "echo \"${nvidia_mask}\" >> /etc/portage/package.mask"
fi
ewarn
ewarn "Failure to perform the steps above could result in a non-working"