From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1266947-garchives=archives.gentoo.org@lists.gentoo.org>
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 922141382C5
for <garchives@archives.gentoo.org>; Sat, 3 Apr 2021 19:03:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id DEE6CE07B3;
Sat, 3 Apr 2021 19:03:12 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(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 C4D32E07B3
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Apr 2021 19:03:12 +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 D94EA340B63
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Apr 2021 19:03:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4D96D636
for <gentoo-commits@lists.gentoo.org>; Sat, 3 Apr 2021 19:03:10 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1617476562.c724d671c026c16f7d2a5b38cd9d30af854ae551.soap@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-460.67.ebuild
X-VCS-Directories: x11-drivers/nvidia-drivers/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: c724d671c026c16f7d2a5b38cd9d30af854ae551
X-VCS-Branch: master
Date: Sat, 3 Apr 2021 19:03:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 4a1712dc-e2e8-402c-89c1-b94c82a582cb
X-Archives-Hash: 08da5a57e77c10362c9925224f8fe3bb
commit: c724d671c026c16f7d2a5b38cd9d30af854ae551
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sat Apr 3 19:02:42 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Apr 3 19:02:42 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c724d671
x11-drivers/nvidia-drivers: require _PM with 460.67 for <5.10 kernels
NVIDIA sets an alternate code path so no-CONFIG_PM works with >=5.10
kernels and opted to remove the PM guard, however this breaks build
with older kernels. Unless the guard is re-added in a future version
this will have to be kept.
Closes: https://bugs.gentoo.org/778920
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
index b160a613192..5f88085c134 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-460.67.ebuild
@@ -95,6 +95,11 @@ pkg_setup() {
Cannot be directly selected in the kernel's menuconfig, so enable
options such as CONFIG_DRM_FBDEV_EMULATION instead."
+ if kernel_is -lt 5 10; then
+ CONFIG_CHECK+=" PM" # needed since 460.67 (bug #778920)
+ local ERROR_PM="CONFIG_PM: is not set but needed with kernel version <5.10"
+ fi
+
BUILD_PARAMS='NV_VERBOSE=1 IGNORE_CC_MISMATCH=yes SYSSRC="${KV_DIR}" SYSOUT="${KV_OUT_DIR}"'
BUILD_TARGETS="modules" # defaults' clean sometimes deletes modules
MODULE_NAMES="