From a3b04c4f027fd47b9b218a3ad1ec27f24bec2119 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 8 Mar 2022 10:55:18 +0100 Subject: [PATCH] add former 'pro' packages to arm64 board/coreos dependencies flatcar-eks/nvidia-drivers/nvidia-metadata are now required to build AWS/Azure images on all architectures, so we need the packages to not be amd64-only dependencies of board-packages or coreos any longer. --- .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 c213a19f46..544fc63812 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 @@ -81,7 +81,6 @@ RDEPEND="${RDEPEND} net-fs/cifs-utils sys-auth/realmd sys-auth/sssd - x11-drivers/nvidia-metadata )" RDEPEND="${RDEPEND} @@ -192,6 +191,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/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 4721b05207..7cac97d4b0 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -22,10 +22,8 @@ RDEPEND=" amd64? ( app-emulation/open-vm-tools coreos-base/coreos-oem-gce - coreos-base/flatcar-eks coreos-base/nova-agent-container coreos-base/nova-agent-watcher - x11-drivers/nvidia-drivers ) arm64? ( sys-boot/grub @@ -35,5 +33,7 @@ RDEPEND=" app-emulation/wa-linux-agent coreos-base/coreos coreos-base/coreos-dev + coreos-base/flatcar-eks dev-lang/python-oem + x11-drivers/nvidia-drivers "