1 |
commit: dc9587461b24be212de1d2b7cc54e0423240861c |
2 |
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jun 27 08:10:38 2021 +0000 |
4 |
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jun 27 08:11:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc958746 |
7 |
|
8 |
app-emulation/qemu: pin new firmware versions |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org> |
12 |
|
13 |
app-emulation/qemu/{qemu-9999.ebuild => qemu-6.0.0-r50.ebuild} | 8 +++++--- |
14 |
app-emulation/qemu/qemu-9999.ebuild | 7 ++++--- |
15 |
2 files changed, 9 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-6.0.0-r50.ebuild |
18 |
similarity index 99% |
19 |
copy from app-emulation/qemu/qemu-9999.ebuild |
20 |
copy to app-emulation/qemu/qemu-6.0.0-r50.ebuild |
21 |
index a3eabad867a..65c20aa5574 100644 |
22 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
23 |
+++ b/app-emulation/qemu/qemu-6.0.0-r50.ebuild |
24 |
@@ -6,7 +6,7 @@ EAPI="7" |
25 |
PYTHON_COMPAT=( python3_{7,8,9,10} ) |
26 |
PYTHON_REQ_USE="ncurses,readline" |
27 |
|
28 |
-FIRMWARE_ABI_VERSION="5.2.0-r50" |
29 |
+FIRMWARE_ABI_VERSION="6.0.0-r50" |
30 |
|
31 |
inherit eutils linux-info toolchain-funcs multilib python-r1 |
32 |
inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils |
33 |
@@ -213,17 +213,18 @@ SOFTMMU_TOOLS_DEPEND=" |
34 |
zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) |
35 |
" |
36 |
|
37 |
+EDK2_OVMF_VERSION="202105" |
38 |
SEABIOS_VERSION="1.14.0" |
39 |
|
40 |
X86_FIRMWARE_DEPEND=" |
41 |
pin-upstream-blobs? ( |
42 |
- ~sys-firmware/edk2-ovmf-202008[binary] |
43 |
+ ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] |
44 |
~sys-firmware/ipxe-1.21.1[binary,qemu] |
45 |
~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] |
46 |
~sys-firmware/sgabios-0.1_pre10[binary] |
47 |
) |
48 |
!pin-upstream-blobs? ( |
49 |
- sys-firmware/edk2-ovmf |
50 |
+ >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} |
51 |
sys-firmware/ipxe[qemu] |
52 |
>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] |
53 |
sys-firmware/sgabios |
54 |
@@ -276,6 +277,7 @@ PATCHES=( |
55 |
"${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch |
56 |
"${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch |
57 |
"${FILESDIR}"/${PN}-5.2.0-dce-locks.patch |
58 |
+ "${FILESDIR}"/${PN}-6.0.0-make.patch |
59 |
) |
60 |
|
61 |
QA_PREBUILT=" |
62 |
|
63 |
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild |
64 |
index a3eabad867a..9919b6047c6 100644 |
65 |
--- a/app-emulation/qemu/qemu-9999.ebuild |
66 |
+++ b/app-emulation/qemu/qemu-9999.ebuild |
67 |
@@ -6,7 +6,7 @@ EAPI="7" |
68 |
PYTHON_COMPAT=( python3_{7,8,9,10} ) |
69 |
PYTHON_REQ_USE="ncurses,readline" |
70 |
|
71 |
-FIRMWARE_ABI_VERSION="5.2.0-r50" |
72 |
+FIRMWARE_ABI_VERSION="6.0.0-r50" |
73 |
|
74 |
inherit eutils linux-info toolchain-funcs multilib python-r1 |
75 |
inherit udev fcaps readme.gentoo-r1 pax-utils l10n xdg-utils |
76 |
@@ -213,17 +213,18 @@ SOFTMMU_TOOLS_DEPEND=" |
77 |
zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) |
78 |
" |
79 |
|
80 |
+EDK2_OVMF_VERSION="202105" |
81 |
SEABIOS_VERSION="1.14.0" |
82 |
|
83 |
X86_FIRMWARE_DEPEND=" |
84 |
pin-upstream-blobs? ( |
85 |
- ~sys-firmware/edk2-ovmf-202008[binary] |
86 |
+ ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[binary] |
87 |
~sys-firmware/ipxe-1.21.1[binary,qemu] |
88 |
~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] |
89 |
~sys-firmware/sgabios-0.1_pre10[binary] |
90 |
) |
91 |
!pin-upstream-blobs? ( |
92 |
- sys-firmware/edk2-ovmf |
93 |
+ >=sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION} |
94 |
sys-firmware/ipxe[qemu] |
95 |
>=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] |
96 |
sys-firmware/sgabios |