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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6AD5815838C for ; Thu, 18 Jan 2024 02:25:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AA01BE2A52; Thu, 18 Jan 2024 02:25:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 89EC2E2A52 for ; Thu, 18 Jan 2024 02:25:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7399B34336A for ; Thu, 18 Jan 2024 02:25:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D655135D for ; Thu, 18 Jan 2024 02:25:49 +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: <1705544732.9d134c943582aba68bf3ba977ca30c44f6f2847e.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-525.147.05.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild X-VCS-Directories: x11-drivers/nvidia-drivers/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 9d134c943582aba68bf3ba977ca30c44f6f2847e X-VCS-Branch: master Date: Thu, 18 Jan 2024 02:25:49 +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: 36544a4f-974f-47af-b917-b4636eb909dc X-Archives-Hash: 2d6ad41aae995d403ce2b5cf90c3feca commit: 9d134c943582aba68bf3ba977ca30c44f6f2847e Author: Ionen Wolkens gentoo org> AuthorDate: Thu Jan 18 02:12:06 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Thu Jan 18 02:25:32 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d134c94 x11-drivers/nvidia-drivers: downgrade KERNEL_MAX to 6.6 for arm64 screen_info is marked GPL on non-x86 and cannot be used. It's possible to tell nvidia-drivers to not use that symbol albeit unknown what downsides this has (esp. when I cannot test this). For now, let's just not advertise 6.7 compatibility for arm64. 6.6 is the next LTS either way, so waiting should not be so bad. Signed-off-by: Ionen Wolkens gentoo.org> x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild | 7 ++++++- x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild | 7 ++++++- x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild | 7 ++++++- x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild index 8198376cd815..aa6b6a283fc6 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-525.147.05.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.7 +MODULES_KERNEL_MAX=6.7 # 6.6 for arm64 (see below) NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -126,6 +126,11 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, and may need selection of another option that requires it such as CONFIG_KVM." + # screen_info is marked GPL on non-x86 in 6.7 and cannot be used + # (patchable, but just avoid advertising compatibility for now) + # https://forums.developer.nvidia.com/t/278367 + use arm64 && MODULES_KERNEL_MAX=6.6 + linux-mod-r1_pkg_setup } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild index 9097157c2346..d4dacb1d7abb 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.146.02.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.7 +MODULES_KERNEL_MAX=6.7 # 6.6 for arm64 (see below) NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -126,6 +126,11 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, and may need selection of another option that requires it such as CONFIG_KVM." + # screen_info is marked GPL on non-x86 in 6.7 and cannot be used + # (patchable, but just avoid advertising compatibility for now) + # https://forums.developer.nvidia.com/t/278367 + use arm64 && MODULES_KERNEL_MAX=6.6 + linux-mod-r1_pkg_setup } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild index eff52fda2b6f..7d6e0cff0496 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-535.154.05.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 multilib readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.7 +MODULES_KERNEL_MAX=6.7 # 6.6 for arm64 (see below) NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -126,6 +126,11 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, and may need selection of another option that requires it such as CONFIG_KVM." + # screen_info is marked GPL on non-x86 in 6.7 and cannot be used + # (patchable, but just avoid advertising compatibility for now) + # https://forums.developer.nvidia.com/t/278367 + use arm64 && MODULES_KERNEL_MAX=6.6 + linux-mod-r1_pkg_setup } diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild index 8150845d19c5..88a0e7d208b5 100644 --- a/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild +++ b/x11-drivers/nvidia-drivers/nvidia-drivers-545.29.06-r1.ebuild @@ -7,7 +7,7 @@ MODULES_OPTIONAL_IUSE=+modules inherit desktop flag-o-matic linux-mod-r1 readme.gentoo-r1 inherit systemd toolchain-funcs unpacker user-info -MODULES_KERNEL_MAX=6.7 +MODULES_KERNEL_MAX=6.7 # 6.6 for arm64 (see below) NV_URI="https://download.nvidia.com/XFree86/" DESCRIPTION="NVIDIA Accelerated Graphics Driver" @@ -123,6 +123,11 @@ pkg_setup() { Cannot be directly selected in the kernel's menuconfig, and may need selection of another option that requires it such as CONFIG_KVM." + # screen_info is marked GPL on non-x86 in 6.7 and cannot be used + # (patchable, but just avoid advertising compatibility for now) + # https://forums.developer.nvidia.com/t/278367 + use arm64 && MODULES_KERNEL_MAX=6.6 + linux-mod-r1_pkg_setup }