From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D765415808B for ; Fri, 15 Apr 2022 20:44:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3FACE0931; Fri, 15 Apr 2022 20:44:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E462AE0924 for ; Fri, 15 Apr 2022 20:44:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CB6863420DD for ; Fri, 15 Apr 2022 20:44:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 396EE250 for ; Fri, 15 Apr 2022 20:44:15 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1650055113.78f19f2a5efedcf7950df56f74781ed770c1884f.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 78f19f2a5efedcf7950df56f74781ed770c1884f X-VCS-Branch: master Date: Fri, 15 Apr 2022 20:44:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd431f3b-b5a6-4b3c-a9bb-6c4903420360 X-Archives-Hash: 3dc3b162777927cfa738809a428b4a41 commit: 78f19f2a5efedcf7950df56f74781ed770c1884f Author: Ionen Wolkens gentoo org> AuthorDate: Fri Apr 15 19:16:01 2022 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Fri Apr 15 20:38:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78f19f2a x11-drivers/nvidia-drivers: use egetent + better sanity check Switching to egetent wasn't very useful given the limited use-cases where nvidia-drivers can be installed (and there's no egetgroupid) but, given there's talk to improve its ROOT / crossdev support, it may be good to finally change this. Also add sanity-check to ensure we got a number, still skip assert so failure will give the sanity-check's error message. Signed-off-by: Ionen Wolkens gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild | 6 +++--- x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild index 6a54413a0717..70758e3edab6 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.147.ebuild @@ -5,7 +5,7 @@ EAPI=7 MODULES_OPTIONAL_USE="driver" inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \ - systemd toolchain-funcs unpacker + systemd toolchain-funcs unpacker user-info NV_KERNEL_MAX="5.15" NV_URI="https://download.nvidia.com/XFree86/" @@ -398,8 +398,8 @@ pkg_preinst() { linux-mod_pkg_preinst # set video group id based on live system (bug #491414) - local g=$(getent group video | cut -d: -f3) - [[ ${g} ]] || die "Failed to determine video group id" + local g=$(egetent group video | cut -d: -f3) + [[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')" sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild index ee701aece3c6..927302a8b1f7 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.103.01.ebuild @@ -5,7 +5,7 @@ EAPI=7 MODULES_OPTIONAL_USE="driver" inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \ - systemd toolchain-funcs unpacker + systemd toolchain-funcs unpacker user-info NV_KERNEL_MAX="5.17" NV_URI="https://download.nvidia.com/XFree86/" @@ -372,8 +372,8 @@ pkg_preinst() { linux-mod_pkg_preinst # set video group id based on live system (bug #491414) - local g=$(getent group video | cut -d: -f3) - [[ ${g} ]] || die "Failed to determine video group id" + local g=$(egetent group video | cut -d: -f3) + [[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')" sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die # try to find driver mismatches using temporary supported-gpus.json diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild index 42bea619cccf..a04389a83803 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-470.62.26.ebuild @@ -5,7 +5,7 @@ EAPI=8 MODULES_OPTIONAL_USE="driver" inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \ - systemd toolchain-funcs unpacker + systemd toolchain-funcs unpacker user-info NV_KERNEL_MAX="5.15" NV_PIN="470.103.01" @@ -372,8 +372,8 @@ pkg_preinst() { linux-mod_pkg_preinst # set video group id based on live system (bug #491414) - local g=$(getent group video | cut -d: -f3) - [[ ${g} ]] || die "Failed to determine video group id" + local g=$(egetent group video | cut -d: -f3) + [[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')" sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die # try to find driver mismatches using temporary supported-gpus.json diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild index faaeef172255..869bb3b67904 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-510.60.02.ebuild @@ -5,7 +5,7 @@ EAPI=8 MODULES_OPTIONAL_USE="driver" inherit desktop flag-o-matic linux-mod multilib readme.gentoo-r1 \ - systemd toolchain-funcs unpacker + systemd toolchain-funcs unpacker user-info NV_KERNEL_MAX="5.17" @@ -386,8 +386,8 @@ pkg_preinst() { linux-mod_pkg_preinst # set video group id based on live system (bug #491414) - local g=$(getent group video | cut -d: -f3) - [[ ${g} ]] || die "Failed to determine video group id" + local g=$(egetent group video | cut -d: -f3) + [[ ${g} =~ ^[0-9]+$ ]] || die "Failed to determine video group id (got '${g}')" sed -i "s/@VIDEOGID@/${g}/" "${ED}"/etc/modprobe.d/nvidia.conf || die # try to find driver mismatches using temporary supported-gpus.json