From 2f6bb0a2d4e1b87ac7046cd2f8b8b69662bcb708 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Oct 2022 12:01:22 +0200 Subject: [PATCH 1/6] profiles: Drop accept_keywords for app-emulation/qemu The updated package is stable for both amd64 and arm64. --- .../coreos-overlay/profiles/coreos/base/package.accept_keywords | 2 -- 1 file changed, 2 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 9c5fd45b1c..bd5bbccaac 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 @@ -7,8 +7,6 @@ =app-arch/zstd-1.4.9 ~amd64 ~arm64 -=app-emulation/qemu-7.0.0-r1 ~arm64 - =coreos-devel/fero-client-0.1.1 ** # Accept unstable host Rust compilers From 6e5e3f99911e7988892569bb40e643d441ac8296 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Oct 2022 17:28:42 +0200 Subject: [PATCH 2/6] profiles: Drop accept keywords for sys-kernel/linux-headers The updated package is stable for both amd64 and arm64. --- .../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 bd5bbccaac..d117ea26eb 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 @@ -27,9 +27,6 @@ =sys-fs/cryptsetup-2.4.1-r1 ~amd64 ~arm64 -# Keep headers in sync with kernel version. -=sys-kernel/linux-headers-5.15 ~amd64 ~arm64 - # Keep iproute in sync with kernel version. =sys-apps/iproute2-5.15.0 ~amd64 ~arm64 From 11c2d903cde308c98c69589d284ac635f11755ec Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 16 Jan 2023 18:21:07 +0100 Subject: [PATCH 3/6] coreos-devel/board-packages: Replace a package We are now pulling sys-firmware/edk2-ovmf-bin instead. --- ...packages-0.0.1-r9.ebuild => board-packages-0.0.1-r10.ebuild} | 0 .../coreos-devel/board-packages/board-packages-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/{board-packages-0.0.1-r9.ebuild => board-packages-0.0.1-r10.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r9.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r10.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r9.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1-r10.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild index 7cac97d4b0..0be0428a6b 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/board-packages/board-packages-0.0.1.ebuild @@ -27,7 +27,7 @@ RDEPEND=" ) arm64? ( sys-boot/grub - sys-firmware/edk2-ovmf + sys-firmware/edk2-ovmf-bin ) app-emulation/amazon-ssm-agent app-emulation/wa-linux-agent From 806d0892964130380dd16f7708c325f1981aaa31 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 16 Jan 2023 18:22:31 +0100 Subject: [PATCH 4/6] coreos-devel/sdk-depends: Replace a package We are now pulling sys-firmware/edk2-ovmf-bin instead. --- ...dk-depends-0.0.1-r44.ebuild => sdk-depends-0.0.1-r45.ebuild} | 0 .../coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/{sdk-depends-0.0.1-r44.ebuild => sdk-depends-0.0.1-r45.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r44.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r45.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r44.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1-r45.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index b3f736df2c..3631e180ba 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -46,7 +46,7 @@ DEPEND=" sys-apps/seismograph sys-boot/grub amd64? ( sys-boot/shim ) - sys-firmware/edk2-ovmf + sys-firmware/edk2-ovmf-bin sys-fs/btrfs-progs sys-fs/cryptsetup dev-perl/Parse-Yapp From 9fa757bb21fe13123e7d2dd566bb375477be7a15 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 16 Jan 2023 16:20:22 +0100 Subject: [PATCH 5/6] coreos-base/hard-host-depends: Drop sys-power/iasl Used to be pulled by some sys-firmware packages, but not any more. --- ...nds-0.0.1-r205.ebuild => hard-host-depends-0.0.1-r206.ebuild} | 0 .../coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - 2 files changed, 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r205.ebuild => hard-host-depends-0.0.1-r206.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r205.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r206.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r205.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r206.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index edc2ae5310..76267e3e90 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -67,7 +67,6 @@ RDEPEND="${RDEPEND} sys-apps/usbutils sys-devel/bc sys-libs/nss-usrfiles - sys-power/iasl virtual/udev " From 7401ea8764ac9b125e1cb7588fe99b5665a8264a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 21 Oct 2022 17:57:23 +0200 Subject: [PATCH 6/6] profiles: Drop accept keywords for sys-power/iasl --- .../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 3540afb293..f146fd516a 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 @@ -43,7 +43,6 @@ =sys-libs/libselinux-3.1-r2 ~arm64 =sys-libs/libsemanage-3.1-r1 ~arm64 =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