From 44fcb0513a79230662b17b28b66659f8e3fd6c39 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Mon, 19 Jul 2021 14:52:08 +0000 Subject: [PATCH] mark platform specific host/sdk dependencies as amd64/!arm64 kola-data and google-cloud-sdk install pre-built amd64 binaries, so there's no point installing them right now. Both could be made to work at a later time. iucode and syslinux and are x86 specific and won't build. selinux related packages *currently* don't work/build on arm64 but could be made to work. Signed-off-by: Jeremi Piotrowski --- .../hard-host-depends/hard-host-depends-0.0.1.ebuild | 4 ++-- .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index b9ad7bb0f9..a05dcc66fc 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -20,7 +20,7 @@ RDEPEND="${RDEPEND} dev-embedded/u-boot-tools dev-util/ccache dev-util/crosutils - sys-boot/syslinux + !arm64? ( sys-boot/syslinux ) sys-devel/crossdev sys-devel/sysroot-wrappers sys-fs/dosfstools @@ -64,7 +64,7 @@ RDEPEND="${RDEPEND} >=dev-util/intltool-0.30 dev-util/scons >=dev-vcs/git-1.7.2 - net-misc/google-cloud-sdk + amd64? ( net-misc/google-cloud-sdk ) sys-apps/usbutils sys-apps/systemd sys-libs/nss-usrfiles diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 7460742637..69c70de78c 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -25,7 +25,7 @@ DEPEND=" coreos-base/hard-host-depends coreos-base/coreos-sb-keys coreos-devel/fero-client - coreos-devel/kola-data + amd64? ( coreos-devel/kola-data ) coreos-devel/mantle dev-libs/gobject-introspection dev-python/setuptools @@ -40,7 +40,7 @@ DEPEND=" net-misc/curl sys-apps/debianutils sys-apps/iproute2 - sys-apps/iucode_tool + amd64? ( sys-apps/iucode_tool ) sys-apps/seismograph sys-boot/grub sys-boot/shim @@ -52,8 +52,10 @@ DEPEND=" # Must match the build-time dependencies listed in selinux-policy-2.eclass DEPEND="${DEPEND} - >=sys-apps/checkpolicy-2.0.21 - >=sys-apps/policycoreutils-2.0.82 + !arm64? ( + >=sys-apps/checkpolicy-2.0.21 + >=sys-apps/policycoreutils-2.0.82 + ) sys-devel/m4" # Required by dev-lang/spidermonkey-1.8.5