From 80f63d2cfb55c8fa6df460d6f73b1b4c42d975a4 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Mon, 4 Jan 2021 11:34:51 +0530 Subject: [PATCH] x11-drivers/nvidia-metadata: Handle NVIDIA Version upgrades Move the NVIDIA variables into a seperate file inorder to handle them when Flatcar upgrade happens Signed-off-by: Sayan Chowdhury --- .../coreos-base/coreos/coreos-0.0.1.ebuild | 1 + .../nvidia-drivers/files/bin/setup-nvidia | 3 +-- ...ebuild => nvidia-drivers-460.32.03.ebuild} | 10 ++++---- .../nvidia-metadata/files/nvidia-metadata | 2 ++ .../nvidia-metadata-450.80.02.ebuild | 23 +++++++++++++++++++ 5 files changed, 32 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/{nvidia-drivers-450.80.02.ebuild => nvidia-drivers-460.32.03.ebuild} (64%) create mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata create mode 100644 sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-450.80.02.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index a104c375c9..40531d70b2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -170,6 +170,7 @@ RDEPEND="${RDEPEND} sys-libs/timezone-data sys-process/lsof sys-process/procps + x11-drivers/nvidia-metadata " # OEM specific bits that need to go in USR diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia index b05bce711e..f113cdc7c7 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/files/bin/setup-nvidia @@ -3,9 +3,8 @@ set -euo pipefail . /usr/share/flatcar/release . /usr/share/flatcar/update.conf +. /usr/share/flatcar/nvidia-metadata -NVIDIA_DRIVER_VERSION=450.80.02 -NVIDIA_PRODUCT_TYPE=tesla NVIDIA_DOWNLOAD_BASEURL="https://us.download.nvidia.com/${NVIDIA_PRODUCT_TYPE}/" NVIDIA_DRIVER_BASENAME="NVIDIA-Linux-x86_64-${NVIDIA_DRIVER_VERSION}" NVIDIA_WORKDIR='nvidia-workdir' diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-460.32.03.ebuild similarity index 64% rename from sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild rename to sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-460.32.03.ebuild index 96e7cb24c0..a47a027d92 100644 --- a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-450.80.02.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-drivers/nvidia-drivers-460.32.03.ebuild @@ -18,9 +18,9 @@ S="${WORKDIR}" RDEPEND="" src_install() { - insinto "/usr/share/oem" - doins -r "${FILESDIR}/units" - exeinto "/usr/share/oem/bin" - doexe "${FILESDIR}/bin/install-nvidia" - doexe "${FILESDIR}/bin/setup-nvidia" + insinto "/usr/share/oem" + doins -r "${FILESDIR}/units" + exeinto "/usr/share/oem/bin" + doexe "${FILESDIR}/bin/install-nvidia" + doexe "${FILESDIR}/bin/setup-nvidia" } diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata new file mode 100644 index 0000000000..e45fc43e12 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/files/nvidia-metadata @@ -0,0 +1,2 @@ +NVIDIA_DRIVER_VERSION=460.32.03 +NVIDIA_PRODUCT_TYPE=tesla diff --git a/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-450.80.02.ebuild b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-450.80.02.ebuild new file mode 100644 index 0000000000..0db1a1a28a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/x11-drivers/nvidia-metadata/nvidia-metadata-450.80.02.ebuild @@ -0,0 +1,23 @@ +# Copyright (c) 2021 Kinvolk GmbH. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="NVIDIA drivers release version and configuration" +HOMEPAGE="" +SRC_URI="" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +# no source directory +S="${WORKDIR}" + +RDEPEND="" + +src_install() { + insinto "/usr/share/flatcar" + doins "${FILESDIR}/nvidia-metadata" +}