From 8d01613b1f1f6ac5982a95d55f74bedbb0955bbc Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Fri, 10 Jun 2022 14:42:02 +0200 Subject: [PATCH] cifs-utils, realmd, sssd, adcli, go-tspi: add ARM64 This change adds multiple tools to ARM64 which were formerly only present in the X86-64 image. Added for ARM64: net-fs/cifs-utils sys-auth/realmd app-admin/adcli app-crypt/go-tspi This leaves only the xenserver-pv-version and xenstore packages exclusively on X86-64. The change un-masks keywords amd64 and arm64 for sys-libs/liburing-2.1-r2 and keyword arm64 for dev-libs/ding-libs-0.6.1-r1, overwriting Gentoo upstream defaults in portage-stable. Partially fixes https://github.com/flatcar-linux/Flatcar/issues/689. Fixes https://github.com/flatcar-linux/Flatcar/issues/690. --- ...2022-06-10-arm64-cifsutils-realmd-sssd-adcli-gotspi.md | 3 +++ .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 8 ++++---- .../profiles/coreos/arm64/package.accept_keywords | 3 +++ .../profiles/coreos/base/package.accept_keywords | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-10-arm64-cifsutils-realmd-sssd-adcli-gotspi.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-10-arm64-cifsutils-realmd-sssd-adcli-gotspi.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-10-arm64-cifsutils-realmd-sssd-adcli-gotspi.md new file mode 100644 index 0000000000..b15f3961ea --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2022-06-10-arm64-cifsutils-realmd-sssd-adcli-gotspi.md @@ -0,0 +1,3 @@ +- ARM64: Added [sssd](https://sssd.io/), [adcli](https://www.freedesktop.org/software/realmd/adcli/adcli.html) and realmd for ARM64 +- ARM64: Added [cifs-utils](https://wiki.samba.org/index.php/LinuxCIFS_utils) for ARM64 +- SDK / ARM64: Added [go-tspi](https://pkg.go.dev/github.com/coreos/go-tspi) bindings for ARM64 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 8c2e0b2d32..cfa614edf5 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 @@ -74,15 +74,12 @@ RDEPEND="${RDEPEND} # Only applicable or available on amd64 RDEPEND="${RDEPEND} amd64? ( - app-admin/adcli - app-crypt/go-tspi app-emulation/xenserver-pv-version app-emulation/xenstore - net-fs/cifs-utils - sys-auth/realmd )" RDEPEND="${RDEPEND} + app-admin/adcli app-admin/etcd-wrapper app-admin/flannel-wrapper app-admin/locksmith @@ -101,6 +98,7 @@ RDEPEND="${RDEPEND} app-arch/unzip app-arch/zip app-crypt/gnupg + app-crypt/go-tspi app-crypt/tpmpolicy app-editors/vim app-emulation/actool @@ -129,6 +127,7 @@ RDEPEND="${RDEPEND} net-firewall/iptables net-firewall/nftables net-fs/nfs-utils + net-fs/cifs-utils net-misc/bridge-utils net-misc/curl net-misc/iputils @@ -169,6 +168,7 @@ RDEPEND="${RDEPEND} sys-apps/usbutils sys-apps/util-linux sys-apps/which + sys-auth/realmd sys-auth/sssd sys-block/open-iscsi sys-block/parted diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 0f71b4a67c..d6852e4057 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -48,3 +48,6 @@ =sys-libs/libsepol-3.1 ~arm64 =sys-power/iasl-20200326 ~arm64 =sys-process/tini-0.18.0 ~arm64 + +# Overwrite portage-stable mask - enable ding-libs for ARM64 +=dev-libs/ding-libs-0.6.1-r1 ~arm64 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 00e1ec922c..eb876efd0a 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 @@ -63,3 +63,6 @@ =dev-vcs/git-2.35.3 ~amd64 ~arm64 =sys-power/acpid-2.0.33 ~amd64 ~arm64 + +# Overwrite portage-stable mask - use latest liburing -r2 for ARM64 and AMD64 +=sys-libs/liburing-2.1-r2 ~amd64 ~arm64