From b5e923e89b133fe768154af69d917fe663ef7bbb Mon Sep 17 00:00:00 2001 From: James Le Cuirot Date: Wed, 2 Oct 2024 11:04:22 +0100 Subject: [PATCH] sys-firmware/edk2-ovmf-bin: Drop in favour of edk2-bin, bump to 202408 Gentoo has moved this package so that it can support multiple platforms. The newer version is needed for Secure Boot support on arm64. This is newer than the version that QEMU is currently pinned to so unpin it via the USE flag. Signed-off-by: James Le Cuirot --- .../workflows/portage-stable-packages-list | 2 +- .../sdk-depends/sdk-depends-0.0.1.ebuild | 2 +- .../coreos/base/package.accept_keywords | 3 + .../profiles/coreos/targets/sdk/package.use | 3 + .../app-emulation/qemu/qemu-7.2.11.ebuild | 18 ++--- .../app-emulation/qemu/qemu-7.2.12.ebuild | 18 ++--- .../app-emulation/qemu/qemu-7.2.13.ebuild | 18 ++--- .../app-emulation/qemu/qemu-8.0.5.ebuild | 18 ++--- .../app-emulation/qemu/qemu-8.1.5.ebuild | 18 ++--- .../app-emulation/qemu/qemu-8.2.3.ebuild | 18 ++--- .../app-emulation/qemu/qemu-8.2.5-r1.ebuild | 18 ++--- .../app-emulation/qemu/qemu-8.2.6-r1.ebuild | 18 ++--- .../app-emulation/qemu/qemu-9.0.1-r1.ebuild | 18 ++--- .../app-emulation/qemu/qemu-9.0.2-r1.ebuild | 18 ++--- .../app-emulation/qemu/qemu-9999.ebuild | 18 ++--- .../portage-stable/profiles/updates/3Q-2024 | 2 + .../sys-firmware/edk2-ovmf-bin/Manifest | 1 - .../edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild | 71 ------------------- .../sys-firmware/edk2-ovmf-bin/metadata.xml | 11 --- 19 files changed, 109 insertions(+), 184 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/metadata.xml diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list index dcabd1f66a..6ec6407777 100644 --- a/.github/workflows/portage-stable-packages-list +++ b/.github/workflows/portage-stable-packages-list @@ -632,7 +632,7 @@ sys-devel/gnuconfig sys-devel/m4 sys-devel/patch -sys-firmware/edk2-ovmf-bin +sys-firmware/edk2-bin sys-firmware/intel-microcode sys-firmware/ipxe sys-firmware/seabios-bin 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 6f13ea4b3a..c604212daa 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 @@ -42,7 +42,7 @@ DEPEND=" amd64? ( sys-apps/iucode_tool ) sys-apps/seismograph sys-boot/grub - sys-firmware/edk2-ovmf-bin + sys-firmware/edk2-bin sys-fs/btrfs-progs sys-fs/cryptsetup dev-perl/Parse-Yapp 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 cd6e0e1db4..bef6f528ae 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 @@ -101,6 +101,9 @@ dev-util/catalyst ~amd64 ~arm64 # Enable ipvsadm for arm64. =sys-cluster/ipvsadm-1.31-r1 ~arm64 +# Needed in SDK for Secure Boot on arm64. +=sys-firmware/edk2-bin-202408 ~amd64 ~arm64 + # Keep versions on both arches in sync. =sys-process/audit-4.0.1-r1 ~arm64 =virtual/perl-Data-Dumper-2.189.0 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use index 27049b2d91..062e03cbe6 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use @@ -29,5 +29,8 @@ sys-libs/zlib static-libs virtual/jpeg static-libs x11-libs/pixman static-libs +# Get latest EDK2 firmware for Secure Boot on arm64. +app-emulation/qemu -pin-upstream-blobs + # Enable gssapi for SDK net-dns/bind-tools gssapi diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.11.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.11.ebuild index e928b05fcd..85edbe0097 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.11.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.11.ebuild @@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -930,10 +930,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -957,10 +957,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.12.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.12.ebuild index f36330d37c..416e1d5ce5 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.12.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.12.ebuild @@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -930,10 +930,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -957,10 +957,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.13.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.13.ebuild index f36330d37c..416e1d5ce5 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.13.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-7.2.13.ebuild @@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -930,10 +930,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -957,10 +957,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild index 9db811fb45..ad54e2275a 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.0.5.ebuild @@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -931,10 +931,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -958,10 +958,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.5.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.5.ebuild index 5aacea7858..8ab472d7d4 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.5.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.1.5.ebuild @@ -240,15 +240,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -931,10 +931,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -958,10 +958,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.3.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.3.ebuild index 570039efaf..fc8ef10ae8 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.3.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.3.ebuild @@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.0" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -951,10 +951,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -978,10 +978,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.5-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.5-r1.ebuild index 97bf795e95..542c81a404 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.5-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.5-r1.ebuild @@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -951,10 +951,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -978,10 +978,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.6-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.6-r1.ebuild index 97bf795e95..542c81a404 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.6-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-8.2.6-r1.ebuild @@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -951,10 +951,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -978,10 +978,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.1-r1.ebuild index 2fe9ba5dd5..2a6e393f87 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.1-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.1-r1.ebuild @@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -955,10 +955,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -982,10 +982,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.2-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.2-r1.ebuild index 2fe9ba5dd5..2a6e393f87 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.2-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9.0.2-r1.ebuild @@ -245,15 +245,15 @@ SEABIOS_VERSION="1.16.3" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -955,10 +955,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -982,10 +982,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild index 9784714035..463efb431e 100644 --- a/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-emulation/qemu/qemu-9999.ebuild @@ -244,15 +244,15 @@ SEABIOS_VERSION="1.16.3" X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + ~sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ~sys-firmware/ipxe-1.21.1[binary,qemu] ~sys-firmware/seabios-bin-${SEABIOS_VERSION} ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( || ( - >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} - >=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-${EDK2_OVMF_VERSION} + >=sys-firmware/edk2-bin-${EDK2_OVMF_VERSION} ) sys-firmware/ipxe[qemu] || ( @@ -954,10 +954,10 @@ pkg_postinst() { if use pin-upstream-blobs && firmware_abi_change; then ewarn "This version of qemu pins new versions of firmware blobs:" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - ewarn " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + ewarn " $(best_version sys-firmware/edk2-bin)" else - ewarn " $(best_version sys-firmware/edk2-ovmf)" + ewarn " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then @@ -981,10 +981,10 @@ pkg_info() { echo "Using:" echo " $(best_version app-emulation/spice-protocol)" - if has_version 'sys-firmware/edk2-ovmf-bin'; then - echo " $(best_version sys-firmware/edk2-ovmf-bin)" + if has_version 'sys-firmware/edk2-bin'; then + echo " $(best_version sys-firmware/edk2-bin)" else - echo " $(best_version sys-firmware/edk2-ovmf)" + echo " $(best_version sys-firmware/edk2)" fi if has_version 'sys-firmware/seabios-bin'; then diff --git a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 index d71acfa1d5..2c5dd6fc52 100644 --- a/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 +++ b/sdk_container/src/third_party/portage-stable/profiles/updates/3Q-2024 @@ -7,3 +7,5 @@ slotmove app-admin/calamares 5 0 slotmove x11-misc/kronometer 5 0 slotmove app-dicts/dikt 5 0 slotmove app-cdr/kcdemu 5 0 +move sys-firmware/edk2-ovmf sys-firmware/edk2 +move sys-firmware/edk2-ovmf-bin sys-firmware/edk2-bin diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/Manifest b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/Manifest deleted file mode 100644 index 3acdd51ad6..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST edk2-ovmf-202202-1.xpak 2672386 BLAKE2B 75c15d4379610ab2af85b78166e350d52f4f1bc1fff5b2eb693ad0d7b1f6648e65d8ae3e2c5467f93f1557ad3b4fa664ab2d76ff10794667de22c2ea8cca6b2d SHA512 06783b89c96bada0fd025ff39eaee501a027abcb03c0bdcf3ff497d52be22927ab03013d90f145ee94a8662cfffe4f8c154dcd06db1bb1acef8a85ae43de14a3 diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild deleted file mode 100644 index 2a1a7048cb..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/edk2-ovmf-bin-202202.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit readme.gentoo-r1 secureboot - -BINPKG="${P/-bin/}-1" - -DESCRIPTION="UEFI firmware for 64-bit x86 virtual machines" -HOMEPAGE="https://github.com/tianocore/edk2" -SRC_URI="https://dev.gentoo.org/~ajak/distfiles/${BINPKG}.xpak" -S="${WORKDIR}" - -# TODO: the binary 202105 package currently lacks the preseeded -# OVMF_VARS.secboot.fd file (that we typically get from fedora) - -LICENSE="BSD-2 MIT" -SLOT="0" -KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86" - -RDEPEND="!sys-firmware/edk2-ovmf" - -DISABLE_AUTOFORMATTING=true -DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86 -virtual machines. The firmware is located under - /usr/share/edk2-ovmf/OVMF_CODE.fd - /usr/share/edk2-ovmf/OVMF_VARS.fd - /usr/share/edk2-ovmf/OVMF_CODE.secboot.fd - -If USE=binary is enabled, we also install an OVMF variables file (coming from -fedora) that contains secureboot default keys - - /usr/share/edk2-ovmf/OVMF_VARS.secboot.fd - -If you have compiled this package by hand, you need to either populate all -necessary EFI variables by hand by booting - /usr/share/edk2-ovmf/UefiShell.(iso|img) -or creating OVMF_VARS.secboot.fd by hand: - https://github.com/puiterwijk/qemu-ovmf-secureboot - -The firmware does not support csm (due to no free csm implementation -available). If you need a firmware with csm support you have to download -one for yourself. Firmware blobs are commonly labeled - OVMF{,_CODE,_VARS}-with-csm.fd - -In order to use the firmware you can run qemu the following way - - $ qemu-system-x86_64 \ - -drive file=/usr/share/edk2-ovmf/OVMF.fd,if=pflash,format=raw,unit=0,readonly=on \ - ..." - -src_unpack() { - tar -xf - < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.xpak") || die "unpacking binpkg failed" -} - -src_install() { - mv "usr/share/doc/${P/-bin/}" "usr/share/doc/${PF}" || die - - # Don't want to try to install the readme from the source package - rm "usr/share/doc/${PF}/README.gentoo.bz2" - mv usr "${ED}" || die - - secureboot_auto_sign --in-place - - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/metadata.xml b/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/metadata.xml deleted file mode 100644 index 674a9e5d13..0000000000 --- a/sdk_container/src/third_party/portage-stable/sys-firmware/edk2-ovmf-bin/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - virtualization@gentoo.org - Gentoo Virtualization Project - - - cpe:/a:tianocore:edk2 - -