summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIonen Wolkens <sudinave@gmail.com>2021-04-03 21:02:48 +0200
committerDavid Seifert <soap@gentoo.org>2021-04-03 21:02:48 +0200
commit2e6bb42aec8c99ff78f6d8bd37f520e20ff8f688 (patch)
treed5c5dfc1f775beb731321fdb1ff60ed019b5ebc6 /x11-drivers
parentx11-drivers/nvidia-drivers: use clearer x86 abi check (diff)
downloadgentoo-2e6bb42aec8c99ff78f6d8bd37f520e20ff8f688.tar.gz
gentoo-2e6bb42aec8c99ff78f6d8bd37f520e20ff8f688.tar.bz2
gentoo-2e6bb42aec8c99ff78f6d8bd37f520e20ff8f688.zip
x11-drivers/nvidia-drivers: use more strict legacy test
Closes: https://bugs.gentoo.org/779583 Signed-off-by: Ionen Wolkens <sudinave@gmail.com> Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'x11-drivers')
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild2
-rw-r--r--x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
index 8626b1e7821a..537b3ffe7409 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild
@@ -354,7 +354,7 @@ pkg_preinst() {
# try to find driver mismatches using temporary supported-gpus.json
for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
- g=$(grep -io "\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+ g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
if [[ ${g} ]]; then
g=$((${g##*\"}+1))
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
index d50b8ea65b6c..e8373cf454fa 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
@@ -359,7 +359,7 @@ pkg_preinst() {
# try to find driver mismatches using temporary supported-gpus.json
for g in $(grep -l 0x10de /sys/bus/pci/devices/*/vendor 2>/dev/null); do
- g=$(grep -io "\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
+ g=$(grep -io "\"devid\":\"$(<${g%vendor}device)\"[^}]*branch\":\"[0-9]*" \
"${ED}"/usr/share/nvidia/supported-gpus.json 2>/dev/null)
if [[ ${g} ]]; then
g=$((${g##*\"}+1))