From 39e9a2cb2e1f69e535ab0e676337e8ebee16f94a Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 13:39:54 +0530 Subject: [PATCH 1/5] profiles: remove accept_keywords for qemu arm64 qemu has been stabilized for arm64 for 7.2.0 so we can drop our profile change for the same. Signed-off-by: Sayan Chowdhury --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 878d639229..dddc2dff56 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 @@ -11,9 +11,6 @@ =app-editors/vim-9.0.1157 ~amd64 ~arm64 =app-editors/vim-core-9.0.1157 ~amd64 ~arm64 -# Keep the version of qemu the same on all arches. -=app-emulation/qemu-7.2.0 ~arm64 - =coreos-devel/fero-client-0.1.1 ** # Accept unstable host Rust compilers From aae3c0977af93f63d3381dd4e3c6f72ac45e242c Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 13:43:40 +0530 Subject: [PATCH 2/5] profiles: remove accept_keywords for glib arm64 glib has been stabilized for arm64 for 2.74.4 so we can drop our profile change for the same. Signed-off-by: Sayan Chowdhury --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 dddc2dff56..2b24f396f7 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 @@ -45,5 +45,4 @@ =app-crypt/adcli-0.9.2 ~amd64 ~arm64 # These are stable for amd64, so pull them in for arm64 too. -=dev-libs/glib-2.74.4 ~arm64 =dev-util/gdbus-codegen-2.74.4 ~arm64 From 06d4d60fbf37c90980556af24a3d13634801b882 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 14:00:11 +0530 Subject: [PATCH 3/5] profiles: remove accept_keywords for curl arm64 curl has been stabilized for arm64 for 7.87.0-r2 so we can drop our profile change for the same. Signed-off-by: Sayan Chowdhury --- .../profiles/coreos/base/package.accept_keywords | 4 ---- 1 file changed, 4 deletions(-) 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 2b24f396f7..3a9493958a 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 @@ -25,10 +25,6 @@ # Required for addressing CVE-2022-29154 =net-misc/rsync-3.2.7-r2 ~amd64 ~arm64 -# Keep the version of curl the same on all arches. -# Also needed for CVE-2022-43551 and CVE-2022-43552. -=net-misc/curl-7.87.0-r2 ~arm64 - =sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 # Keep iproute in sync with kernel version. From abcff6518349b5c2b362be6380ff24ae70e06a9f Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 16:55:33 +0530 Subject: [PATCH 4/5] profiles: remove accept_keywords for gcc arm64 gcc has been stabilized for arm64 for 11.3.1_p20230120-r1 so we can drop our profile change for the same. Signed-off-by: Sayan Chowdhury --- .../profiles/coreos/arm64/package.accept_keywords | 4 ---- 1 file changed, 4 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 774d3072fd..9078a1712c 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 @@ -34,10 +34,6 @@ # needed to force enable ipvsadm for arm64 =sys-cluster/ipvsadm-1.27-r1 ** -# needed to enable gcc 11.3.1_p20230120-r1 for arm64, a required version -# for fixing build issues in glibc with gcc, w.r.t USE flag cet. -=sys-devel/gcc-11.3.1_p20230120-r1 ~arm64 - =sys-firmware/edk2-aarch64-18.02 ** =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 From 42b3833b350f7be087cdc742cbc9fe468854cbfe Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Tue, 21 Feb 2023 17:56:27 +0530 Subject: [PATCH 5/5] profiles: remove accept_keywords for gdbus-codegen arm64 gdbus-codegen has been stabilized for arm64 for 2.74.4 so we can drop our profile change for the same. Signed-off-by: Sayan Chowdhury --- .../profiles/coreos/base/package.accept_keywords | 3 --- 1 file changed, 3 deletions(-) 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 3a9493958a..267bec6706 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 @@ -39,6 +39,3 @@ =sys-libs/liburing-2.1-r2 ~amd64 ~arm64 =app-crypt/adcli-0.9.2 ~amd64 ~arm64 - -# These are stable for amd64, so pull them in for arm64 too. -=dev-util/gdbus-codegen-2.74.4 ~arm64