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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DE0A5139345 for ; Wed, 21 Jul 2021 19:44:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EBB78E0A9F; Wed, 21 Jul 2021 19:44:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id BBAFCE0874 for ; Wed, 21 Jul 2021 19:44:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6F9D8342BBD for ; Wed, 21 Jul 2021 19:44:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 022C57B2 for ; Wed, 21 Jul 2021 19:44:44 +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: <1626896569.701b87679ae89e02d11be22d235081fa55ae58be.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-drivers/nvidia-drivers/, x11-drivers/nvidia-drivers/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-drivers/nvidia-drivers/files/nvidia-169.07 x11-drivers/nvidia-drivers/files/nvidia-390.conf x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ x11-drivers/nvidia-drivers/files/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 701b87679ae89e02d11be22d235081fa55ae58be X-VCS-Branch: master Date: Wed, 21 Jul 2021 19:44:44 +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: 9aca53ea-af37-4036-9539-eafae857e783 X-Archives-Hash: 498de55ecb7b155ea5d358c71446e026 commit: 701b87679ae89e02d11be22d235081fa55ae58be Author: Ionen Wolkens gentoo org> AuthorDate: Wed Jul 21 14:42:42 2021 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Wed Jul 21 19:42:49 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=701b8767 x11-drivers/nvidia-drivers: rename 390.xx filesdir files nvidia-390.conf was named the same as the other nvidia-*.conf, but it serves a completely different purpose. Then nvidia-169.07 differed from the rest. nvidia-390.conf -> nvidia-drm-outputclass-390.conf nvidia-169.07 -> nvidia-390.conf At same time, also adjust for prefix (as unlikely as it is, running a prefix Xorg server with prefix nvidia-drivers[-driver] is possible). Signed-off-by: Ionen Wolkens gentoo.org> x11-drivers/nvidia-drivers/files/nvidia-169.07 | 14 -------------- x11-drivers/nvidia-drivers/files/nvidia-390.conf | 21 ++++++++++++++------- .../files/nvidia-drm-outputclass-390.conf | 7 +++++++ .../nvidia-drivers/nvidia-drivers-390.143-r1.ebuild | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/x11-drivers/nvidia-drivers/files/nvidia-169.07 b/x11-drivers/nvidia-drivers/files/nvidia-169.07 deleted file mode 100644 index a96b0cd1e40..00000000000 --- a/x11-drivers/nvidia-drivers/files/nvidia-169.07 +++ /dev/null @@ -1,14 +0,0 @@ -# Nvidia drivers support -alias char-major-195 nvidia -alias /dev/nvidiactl char-major-195 - -# To tweak the driver the following options can be used, note that -# you should be careful, as it could cause instability!! For more -# options see /usr/share/doc/PACKAGE/README -# -# !!! SECURITY WARNING !!! -# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW -# WHAT YOU ARE DOING. -# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, -# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. -options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-390.conf index 7666989fa47..a96b0cd1e40 100644 --- a/x11-drivers/nvidia-drivers/files/nvidia-390.conf +++ b/x11-drivers/nvidia-drivers/files/nvidia-390.conf @@ -1,7 +1,14 @@ -Section "OutputClass" - Identifier "nvidia" - MatchDriver "nvidia-drm" - Driver "nvidia" - Option "AllowEmptyInitialConfiguration" - ModulePath "/usr/%LIBDIR%/extensions/nvidia" -EndSection +# Nvidia drivers support +alias char-major-195 nvidia +alias /dev/nvidiactl char-major-195 + +# To tweak the driver the following options can be used, note that +# you should be careful, as it could cause instability!! For more +# options see /usr/share/doc/PACKAGE/README +# +# !!! SECURITY WARNING !!! +# DO NOT MODIFY OR REMOVE THE DEVICE FILE RELATED OPTIONS UNLESS YOU KNOW +# WHAT YOU ARE DOING. +# ONLY ADD TRUSTED USERS TO THE VIDEO GROUP, THESE USERS MAY BE ABLE TO CRASH, +# COMPROMISE, OR IRREPARABLY DAMAGE THE MACHINE. +options nvidia NVreg_DeviceFileMode=432 NVreg_DeviceFileUID=0 NVreg_DeviceFileGID=VIDEOGID NVreg_ModifyDeviceFiles=1 diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf new file mode 100644 index 00000000000..f459c69dad8 --- /dev/null +++ b/x11-drivers/nvidia-drivers/files/nvidia-drm-outputclass-390.conf @@ -0,0 +1,7 @@ +Section "OutputClass" + Identifier "nvidia" + MatchDriver "nvidia-drm" + Driver "nvidia" + Option "AllowEmptyInitialConfiguration" + ModulePath "@LIBDIR@/extensions/nvidia" +EndSection diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild index 86fc5834f0e..4d8f0d912d0 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.143-r1.ebuild @@ -163,8 +163,8 @@ src_prepare() { sed 's/__NV_VK_ICD__/libGLX_nvidia.so.0/' \ nvidia_icd.json.template > nvidia_icd.json || die - sed "s/%LIBDIR%/$(get_libdir)/g" "${FILESDIR}/nvidia-390.conf" \ - > nvidia-drm-outputclass.conf || die + sed "s|@LIBDIR@|${EPREFIX}/usr/$(get_libdir)|" \ + "${FILESDIR}"/nvidia-drm-outputclass-390.conf > nvidia-drm-outputclass.conf || die gzip -d nvidia-{cuda-mps-control,smi}.1.gz || die } @@ -268,7 +268,7 @@ src_install() { linux-mod_src_install insinto /etc/modprobe.d - newins "${FILESDIR}"/nvidia-169.07 nvidia.conf + newins "${FILESDIR}"/nvidia-390.conf nvidia.conf doins "${FILESDIR}"/nvidia-blacklist-nouveau.conf doins "${FILESDIR}"/nvidia-rmmod.conf fi