commit: d6ca5a14a6e6b443244cb1142fdccb9f6d6cea97 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Apr 5 14:53:21 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Apr 5 14:53:50 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6ca5a14
app-emulation/qemu: fix seabios pin for ppc Reported-by: Michał Górny Closes: https://bugs.gentoo.org/780378 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> app-emulation/qemu/qemu-5.2.0-r50.ebuild | 10 ++++++---- app-emulation/qemu/qemu-9999.ebuild | 22 ++++++++++++---------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/app-emulation/qemu/qemu-5.2.0-r50.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild index 68f70cb16fa..6b9bfbec8c9 100644 --- a/app-emulation/qemu/qemu-5.2.0-r50.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild @@ -170,25 +170,27 @@ SOFTMMU_TOOLS_DEPEND=" zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) " +SEABIOS_VERSION="1.14.0" + X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( ~sys-firmware/edk2-ovmf-202008[binary] ~sys-firmware/ipxe-1.21.1[binary,qemu] - ~sys-firmware/seabios-1.14.0[binary,seavgabios] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] - >=sys-firmware/seabios-1.10.2[seavgabios] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] sys-firmware/sgabios )" PPC_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/seabios-1.12.0[binary,seavgabios] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] ) !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] ) " diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 10dfadd62e5..8fdcc724a76 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -6,10 +6,10 @@ EAPI="7" PYTHON_COMPAT=( python3_{7,8,9} ) PYTHON_REQ_USE="ncurses,readline" -FIRMWARE_ABI_VERSION="4.0.0-r50" +FIRMWARE_ABI_VERSION="5.2.0-r50" -inherit eutils linux-info toolchain-funcs multilib python-r1 \ - udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils +inherit eutils linux-info toolchain-funcs multilib python-r1 +inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git"; @@ -169,25 +169,27 @@ SOFTMMU_TOOLS_DEPEND=" zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) " +SEABIOS_VERSION="1.14.0" + X86_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-201905[binary] - ~sys-firmware/ipxe-1.0.0_p20190728[binary,qemu] - ~sys-firmware/seabios-1.12.0[binary,seavgabios] - ~sys-firmware/sgabios-0.1_pre8[binary] + ~sys-firmware/edk2-ovmf-202008[binary] + ~sys-firmware/ipxe-1.21.1[binary,qemu] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] + ~sys-firmware/sgabios-0.1_pre10[binary] ) !pin-upstream-blobs? ( sys-firmware/edk2-ovmf sys-firmware/ipxe[qemu] - >=sys-firmware/seabios-1.10.2[seavgabios] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] sys-firmware/sgabios )" PPC_FIRMWARE_DEPEND=" pin-upstream-blobs? ( - ~sys-firmware/seabios-1.12.0[binary,seavgabios] + ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] ) !pin-upstream-blobs? ( - >=sys-firmware/seabios-1.10.2[seavgabios] + >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] ) "
