commit: 2e6bb42aec8c99ff78f6d8bd37f520e20ff8f688 Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com> AuthorDate: Sat Apr 3 19:02:48 2021 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Apr 3 19:02:48 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6bb42a
x11-drivers/nvidia-drivers: use more strict legacy test Closes: https://bugs.gentoo.org/779583 Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com> Signed-off-by: David Seifert <soap <AT> gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-450.102.04-r1.ebuild | 2 +- x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild | 2 +- 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 8626b1e7821..537b3ffe740 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 d50b8ea65b6..e8373cf454f 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))
