From f61987b23ccbf56f698e625d684a43afce092c81 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Fri, 7 Mar 2025 11:40:14 +0000 Subject: [PATCH] nvidia-drivers: Split amd64 and arm64 driver version The R535 driver branch, which is LTS, does not compile on arm64 with GCC 14/kernel 6.6. Keep amd64 on R535 and switch arm64 to R570 by default. R570 is the first driver version that I found that is currently supported and works for arm64. Signed-off-by: Jeremi Piotrowski --- .../nvidia-drivers/files/nvidia-metadata | 2 +- ...build => nvidia-drivers-535.230.02.ebuild} | 6 ++-- .../nvidia-drivers-570.86.15.ebuild | 30 +++++++++++++++++++ 3 files changed, 35 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/{nvidia-drivers-535.216.01.ebuild => nvidia-drivers-535.230.02.ebuild} (78%) create mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.15.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-metadata b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-metadata index 6ec82b56bd..34b387e45c 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-metadata +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/nvidia-metadata @@ -1,2 +1,2 @@ -NVIDIA_DRIVER_VERSION=535.216.01 +NVIDIA_DRIVER_VERSION=@PV@ NVIDIA_PRODUCT_TYPE=tesla diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild similarity index 78% rename from sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01.ebuild rename to sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild index 53465ec289..63b6d962e9 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.216.01.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-535.230.02.ebuild @@ -11,7 +11,7 @@ SRC_URI="" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="amd64 arm64" +KEYWORDS="amd64" IUSE="" # no source directory @@ -23,6 +23,8 @@ src_install() { exeinto "/usr/lib/nvidia/bin" doexe "${FILESDIR}/bin/install-nvidia" doexe "${FILESDIR}/bin/setup-nvidia" + cp "${FILESDIR}/nvidia-metadata" nvidia-metadata || die "cp failed" + sed -i -e "s/@PV@/${PV}/" nvidia-metadata insinto "/usr/share/flatcar" - doins "${FILESDIR}/nvidia-metadata" + doins nvidia-metadata } diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.15.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.15.ebuild new file mode 100644 index 0000000000..0e9ef08f4c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-570.86.15.ebuild @@ -0,0 +1,30 @@ +# Copyright (c) 2020 Kinvolk GmbH. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit systemd + +DESCRIPTION="NVIDIA drivers" +HOMEPAGE="" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="arm64" +IUSE="" + +# no source directory +S="${WORKDIR}" + +src_install() { + systemd_dounit "${FILESDIR}/units/nvidia.service" + systemd_enable_service multi-user.target nvidia.service + exeinto "/usr/lib/nvidia/bin" + doexe "${FILESDIR}/bin/install-nvidia" + doexe "${FILESDIR}/bin/setup-nvidia" + cp "${FILESDIR}/nvidia-metadata" nvidia-metadata || die "cp failed" + sed -i -e "s/@PV@/${PV}/" nvidia-metadata + insinto "/usr/share/flatcar" + doins nvidia-metadata +}