sys-firmware/edk2-ovmf: Rename to edk2 to support other platforms

There is a lot of overlap in building firmware for other platforms from
source, so it makes sense to have one source package.

Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot 2024-09-25 14:56:27 +01:00
parent 513e83fc3a
commit fa0b11750c
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
30 changed files with 57 additions and 56 deletions

View File

@ -19,7 +19,7 @@ RDEPEND="
app-emulation/qemu
sys-apps/bubblewrap
sys-apps/systemd
|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )"
|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2 )"
BDEPEND="virtual/pandoc"
distutils_enable_tests pytest

View File

@ -19,7 +19,7 @@ RDEPEND="
app-emulation/qemu
sys-apps/bubblewrap
sys-apps/systemd
|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )"
|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2 )"
BDEPEND="virtual/pandoc"
distutils_enable_tests pytest

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -933,7 +933,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -960,7 +960,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -933,7 +933,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -960,7 +960,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -933,7 +933,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -960,7 +960,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -933,7 +933,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -960,7 +960,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -934,7 +934,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -961,7 +961,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -247,7 +247,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -934,7 +934,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -961,7 +961,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -954,7 +954,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-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,7 +981,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -954,7 +954,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-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,7 +981,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -954,7 +954,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-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,7 +981,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -954,7 +954,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-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,7 +981,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -958,7 +958,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -985,7 +985,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -252,7 +252,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -958,7 +958,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -985,7 +985,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -961,7 +961,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -988,7 +988,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -254,7 +254,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -961,7 +961,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -988,7 +988,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -960,7 +960,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -987,7 +987,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -253,7 +253,7 @@ X86_FIRMWARE_DEPEND="
)
!pin-upstream-blobs? (
|| (
>=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-${EDK2_OVMF_VERSION}
>=sys-firmware/edk2-ovmf-bin-${EDK2_OVMF_VERSION}
)
sys-firmware/ipxe[qemu]
@ -960,7 +960,7 @@ pkg_postinst() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
ewarn " $(best_version sys-firmware/edk2-ovmf-bin)"
else
ewarn " $(best_version sys-firmware/edk2-ovmf)"
ewarn " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then
@ -987,7 +987,7 @@ pkg_info() {
if has_version 'sys-firmware/edk2-ovmf-bin'; then
echo " $(best_version sys-firmware/edk2-ovmf-bin)"
else
echo " $(best_version sys-firmware/edk2-ovmf)"
echo " $(best_version sys-firmware/edk2)"
fi
if has_version 'sys-firmware/seabios-bin'; then

View File

@ -9,3 +9,4 @@ slotmove app-dicts/dikt 5 0
slotmove app-cdr/kcdemu 5 0
move sys-apps/azure-nvme-utils sys-apps/azure-vm-utils
move dev-python/sphinx-aiohttp-theme dev-python/aiohttp-theme
move sys-firmware/edk2-ovmf sys-firmware/edk2

View File

@ -19,7 +19,7 @@ LICENSE="BSD-2 MIT"
SLOT="0"
KEYWORDS="amd64 arm64 ~loong ~ppc ppc64 ~riscv x86"
RDEPEND="!sys-firmware/edk2-ovmf"
RDEPEND="!sys-firmware/edk2"
DISABLE_AUTOFORMATTING=true
DOC_CONTENTS="This package contains the tianocore edk2 UEFI firmware for 64-bit x86

View File

@ -1,4 +1,4 @@
# Copyright 1999-2023 Gentoo Authors
# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8

View File

@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
|| ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
)
!grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_pc]

View File

@ -22,11 +22,11 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
|| ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
)
grub_platforms_efi-32? (
sys-boot/grub:2[grub_platforms_efi-32]
|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
|| ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
)
!grub_platforms_efi-32? (
!grub_platforms_efi-64? (

View File

@ -22,7 +22,7 @@ RDEPEND="app-emulation/qemu
sys-fs/mtools
grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_efi-64]
|| ( sys-firmware/edk2-ovmf sys-firmware/edk2-ovmf-bin )
|| ( sys-firmware/edk2 sys-firmware/edk2-ovmf-bin )
)
!grub_platforms_efi-64? (
sys-boot/grub:2[grub_platforms_pc]