From 0f517b2d1a8d47e552963bbf82e7eeef84846d11 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Tue, 13 Jun 2023 09:22:34 +0200 Subject: [PATCH] overlay profiles: Add comments for accept keywords --- .../coreos/arm64/package.accept_keywords | 16 ++++++-------- .../coreos/base/package.accept_keywords | 21 +++++++++++-------- .../targets/sdk/package.accept_keywords | 1 + 3 files changed, 19 insertions(+), 19 deletions(-) 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 1d572ea428..5a355c1301 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 @@ -1,40 +1,36 @@ # arm64 keywords # Keep these in alphabetical order. -# needed by arm64-native SDK +# Needed by arm64-native SDK. =app-crypt/rhash-1.4.2 ~arm64 =app-emulation/open-vmdk-1.0 * - =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64 - -# needed by arm64-native SDK =dev-lang/nasm-2.15.05 ~arm64 - =dev-lang/yasm-1.3.0-r1 ~arm64 -# Overwrite portage-stable mask - enable ding-libs for ARM64 +# Overwrite portage-stable mask - enable ding-libs for ARM64. =dev-libs/ding-libs-0.6.1-r1 ~arm64 +# Should be gone. =net-dns/c-ares-1.17.2 ~arm64 +# Keep version the same on both arches. =net-firewall/conntrack-tools-1.4.6-r1 ~arm64 =net-libs/libnetfilter_cthelper-1.0.0-r1 ~arm64 =net-libs/libnetfilter_cttimeout-1.0.0-r1 ~arm64 - =sec-policy/selinux-base-2.20200818-r2 ~arm64 =sec-policy/selinux-base-policy-2.20200818-r2 ~arm64 =sec-policy/selinux-unconfined-2.20200818-r2 ~arm64 =sec-policy/selinux-virt-2.20200818-r2 ~arm64 =sys-apps/checkpolicy-3.1 ~arm64 - =sys-apps/kexec-tools-2.0.24 ~arm64 =sys-apps/policycoreutils-3.1-r3 ~arm64 - =sys-apps/semodule-utils-3.1 ~arm64 -# needed to force enable ipvsadm for arm64 +# Needed to force enable ipvsadm for arm64. =sys-cluster/ipvsadm-1.27-r1 ** +# Keep version the same on both arches. =sys-firmware/edk2-aarch64-18.02 ** =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.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 07d0210557..cf0d7acfe8 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 @@ -2,50 +2,53 @@ # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 +# Seems to be the only available ebuild in portage-stable right now. =app-crypt/adcli-0.9.2 ~amd64 ~arm64 # Required for addressing CVE-2022-3715. =app-shells/bash-5.2_p15-r2 ~amd64 ~arm64 +# No keyword for arm64 yet. =coreos-devel/fero-client-0.1.1 ** -# Accept unstable host Rust compilers +# Accept unstable host Rust compilers. =dev-lang/rust-1.69.0 ~amd64 ~arm64 # Keep versions on both arches in sync. =dev-libs/libbsd-0.11.7-r2 ~arm64 =dev-libs/libgcrypt-1.10.1-r3 ~arm64 -# To keep the same version on both arches +# To keep the same version on both arches. =dev-util/bpftool-6.2.1 ~arm64 # Required for addressing CVE-2023-0361. =net-libs/gnutls-3.8.0 ~amd64 ~arm64 -# Required for addressing CVE-2023-28319, CVE-2023-28320, CVE-2023-28321 and CVE-2023-28322 +# Required for addressing CVE-2023-28319, CVE-2023-28320, CVE-2023-28321 and CVE-2023-28322. =net-misc/curl-8.1.0 ~amd64 ~arm64 +# These should be gone. =sys-apps/nvme-cli-2.4-r2 ~amd64 ~arm64 - =sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 -# FIPS support is still being tested +# FIPS support is still being tested. =sys-fs/cryptsetup-2.4.3-r1 ~amd64 ~arm64 -# To keep the same version on both arches +# To keep the same version on both arches. =sys-fs/multipath-tools-0.9.4-r1 ~amd64 -# Needed to address CVE-2023-2602 and CVE-2023-2603 +# Needed to address CVE-2023-2602 and CVE-2023-2603. =sys-libs/libcap-2.69 ~amd64 ~arm64 -# Overwrite portage-stable mask - use latest liburing -r2 for ARM64 and AMD64 +# Overwrite portage-stable mask - use latest liburing -r2 for ARM64 and AMD64. =sys-libs/liburing-2.1-r2 ~amd64 ~arm64 # A dependency of app-shells/bash version that we need for security # fixes. =sys-libs/readline-8.2_p1 ~amd64 ~arm64 +# ? =sys-power/acpid-2.0.33 ~amd64 ~arm64 -# Accept unstable host Rust compilers +# Accept unstable host Rust compilers. =virtual/rust-1.69.0 ~amd64 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords index 40aeb5865c..338f281b4a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.accept_keywords @@ -1 +1,2 @@ +# Needed by arm64-native SDK. =app-crypt/efitools-1.9.2 ~arm64