From 564c0fb62f9d26f7a3bd4c7684465afce7a9bb02 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 29 May 2024 14:44:35 +0200 Subject: [PATCH 1/2] coreos-overlay/profiles: Keyword ccid for arm64 ccid-1.5.4 is marked ~arm64 but is a depdendency of the Flatcar SDK. Keyword in profile so that an arm64 SDK can be built. Signed-off-by: Jeremi Piotrowski --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index b7e1420aef..5e9657a303 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -14,6 +14,9 @@ # Seems to be the only available ebuild in portage-stable right now. =app-crypt/adcli-0.9.2 ~amd64 ~arm64 +# Needed by arm64-native SDK +=app-crypt/ccid-1.5.4 ~arm64 + # The only available ebuild (from GURU) has ~amd64 and no keyword for arm64 yet. =app-crypt/clevis-19-r1 ** From 7c0335326ff7ae43522946a010f13aa02029f9d7 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 29 May 2024 16:10:17 +0200 Subject: [PATCH 2/2] coreos-overlay/fero-client: Keyword for arm64 fero-client is a dependency of the Flatcar SDK. Keyword it so that the Flatcar SDK can be built for arm64. The keyword entry from the profile can be removed, it wasn't used since the ebuild was upreved to -r1. Signed-off-by: Jeremi Piotrowski --- .../coreos-devel/fero-client/fero-client-9999.ebuild | 4 ++-- .../profiles/coreos/base/package.accept_keywords | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild index de7e2d34ba..aefcc94e21 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/fero-client/fero-client-9999.ebuild @@ -8,10 +8,10 @@ CROS_WORKON_LOCALNAME="fero" CROS_WORKON_REPO="https://github.com" if [[ ${PV} == 9999 ]]; then - KEYWORDS="~amd64" + KEYWORDS="~amd64 ~arm64" else CROS_WORKON_COMMIT="1fb33da499e51b2699394d158b0b66d36fc52974" # v0.1.1 - KEYWORDS="amd64" + KEYWORDS="amd64 arm64" fi inherit cargo cros-workon diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 5e9657a303..c7c0d75268 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -29,9 +29,6 @@ # Required for addressing CVE-2022-3715. =app-shells/bash-5.2_p26 ~amd64 ~arm64 -# No keyword for arm64 yet. -=coreos-devel/fero-client-0.1.1 ** - # Needed by arm64-native SDK. =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64 =dev-lang/nasm-2.15.05 ~arm64