From 1c4c5d0a3d5f33d61565e1de5d7b47fd24be3855 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 16:49:05 +0100 Subject: [PATCH 1/9] profiles: Drop dev-cpp/gflags from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 ce0f4b8446..ebe6bccd23 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 @@ -5,7 +5,6 @@ =app-emulation/open-vmdk-1.0 * =app-misc/jq-1.6-r3 ~arm64 -=dev-cpp/gflags-2.2.0 ~arm64 =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64 # needed by arm64-native SDK From 8bdb5b4216342705b13919107a63f5c23d854b59 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 17:22:03 +0100 Subject: [PATCH 2/9] profiles: Drop sys-apps/sandbox from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 ebe6bccd23..dcdf836266 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 @@ -38,7 +38,6 @@ =sys-apps/policycoreutils-3.1-r3 ~arm64 =sys-apps/kexec-tools-2.0.22 ~arm64 -=sys-apps/sandbox-2.12 ~arm64 =sys-apps/semodule-utils-3.1 ~arm64 # needed to force enable ipvsadm for arm64 From 464d0fdcd41a9039d1f7dcbeaceb9a6ac8eb114c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 17:30:22 +0100 Subject: [PATCH 3/9] profiles: Update accept_keywords for app-crypt/efitools --- .../profiles/coreos/targets/sdk/package.accept_keywords | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 691e679f06..40aeb5865c 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 @@ -=app-crypt/efitools-1.8.1 ~amd64 ~arm64 +=app-crypt/efitools-1.9.2 ~arm64 From 20212237627df9be1a97f761f48f763102b31d46 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 17:53:13 +0100 Subject: [PATCH 4/9] profiles: Drop sys-fs/quota from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 dcdf836266..4f41aa6681 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 @@ -45,7 +45,6 @@ =sys-firmware/edk2-aarch64-18.02 ** =sys-fs/btrfs-progs-4.19.1 ~arm64 -=sys-fs/quota-4.04-r1 ~arm64 =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 =sys-libs/libsepol-3.1 ~arm64 From 93237a0bf42b4ae0fe0474ddc8f1e891e26d9768 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 17:55:02 +0100 Subject: [PATCH 5/9] profiles: Drop dev-libs/libassuan from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 4f41aa6681..c7b116f5a6 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 @@ -11,7 +11,6 @@ =dev-lang/nasm-2.14.02 * =dev-lang/yasm-1.3.0-r1 ~arm64 -=dev-libs/libassuan-2.5.1 ~arm64 =dev-libs/libusb-1.0.21 ~arm64 # needed to force enable bpftool for arm64 From 7f38b34ca0820fa7dfac57bf818148ee036425ee Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 18:05:32 +0100 Subject: [PATCH 6/9] profiles: Drop dev-libs/libusb from accept_keywords The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 - 1 file changed, 1 deletion(-) 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 c7b116f5a6..03ee2659c1 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 @@ -11,7 +11,6 @@ =dev-lang/nasm-2.14.02 * =dev-lang/yasm-1.3.0-r1 ~arm64 -=dev-libs/libusb-1.0.21 ~arm64 # needed to force enable bpftool for arm64 =dev-util/bpftool-5.15.8 ** From 9e6d34f9294958e71e8366504dfed3c18de2aeb8 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 18:13:14 +0100 Subject: [PATCH 7/9] profiles: Drop outdated use flag for dev-libs/protobuf --- .../third_party/coreos-overlay/profiles/coreos/base/package.use | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 8574c56c03..e02b5e85a6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -6,7 +6,6 @@ app-arch/tar minimal app-crypt/mit-krb5 -keyutils dev-libs/dbus-glib tools -dev-libs/protobuf -python dev-libs/libxml2 -python dev-util/perf tui -doc dev-vcs/git webdav curl bash-completion From 833d18a78bf533b2c9331d336bf3315078d04811 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 2 Mar 2022 18:18:09 +0100 Subject: [PATCH 8/9] profiles: Add accept_keywords for app-crypt/rhash So the version used for the potential arm64 SDK is the same as in amd64 SDK. --- .../coreos-overlay/profiles/coreos/arm64/package.accept_keywords | 1 + 1 file changed, 1 insertion(+) 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 03ee2659c1..4e079806b8 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 @@ -3,6 +3,7 @@ # needed by arm64-native SDK =app-emulation/open-vmdk-1.0 * +=app-crypt/rhash-1.4.2 ~arm64 =app-misc/jq-1.6-r3 ~arm64 =dev-embedded/u-boot-tools-2021.04_rc2 ~arm64 From d784aa9238932218f922ed7a487eae642ad2d66e Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 4 Mar 2022 17:24:33 +0100 Subject: [PATCH 9/9] coreos-base/update_engine: Drop unused alias --- ...e_engine-0.4.10-r5.ebuild => update_engine-0.4.10-r6.ebuild} | 0 .../coreos-base/update_engine/update_engine-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/{update_engine-0.4.10-r5.ebuild => update_engine-0.4.10-r6.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r6.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r5.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.4.10-r6.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild index 2635599ba2..8d1167674d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-9999.ebuild @@ -8,7 +8,7 @@ CROS_WORKON_REPO="https://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="de8da9b92d6db3f08bd83f01cc8de2b3c15e675e" # flatcar-master + CROS_WORKON_COMMIT="748eb99b18b67747f2e047327e9f2a18aa09d3b5" # flatcar-master KEYWORDS="amd64 arm64" fi