app-emulation/qemu: Sync with Gentoo

It's from Gentoo commit 783238c832f2b67dff3f54b5c2819bdb2916b10a.

Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
Flatcar Buildbot 2025-09-01 07:06:43 +00:00 committed by Krzesimir Nowak
parent d0bd0bcad2
commit 966d28a5ca
11 changed files with 1060 additions and 15 deletions

View File

@ -5,6 +5,8 @@ DIST qemu-10.0.0-docs.tar.xz 2651472 BLAKE2B 38be083c0c046e975a829df280894284259
DIST qemu-10.0.0.tar.xz 135618260 BLAKE2B 3408c7b2a38ace7f0b2e0912411a26cab96cb23bcb03d7095f7b081cb88db55f36b004ff6458281d73190b9cc9006da85dde2a0b4b068c80662a8de205c29fda SHA512 2215458ed8be3ab0b0032fe2a96e79183f5fc2da323d927018412ea3d980b022a07ba87d4f446229eaaa7d1b19a577d438dbcaa3af3bd537c7720b56734a2d8b
DIST qemu-10.0.2.tar.xz 135678180 BLAKE2B be4ddf050d2102cefded5b4967222df749ee8af92c2427c31a9b29b3800fac8bb328daf2c38d11aa307b51eb7d7243f9b064b3bf24d446a001e5520359ee83c3 SHA512 7fda582c3845ea663aa5eda21bb38ebcfb6c25bccf8944ea6cdf8b5be6946b5a874b36674a7f5db3e325abb9cca0dd9bc0727837fdceb71a8c947d96169a9b20
DIST qemu-10.0.3.tar.xz 135736600 BLAKE2B 382800d9a9f5241123ebeb43d8eaa6a4aaf9acae0df7a25f2c7831aa7eeb97014cff29886c53f03ea0a1ac98729b85bad1e4d5634e592a373af84f79a9219adc SHA512 7f37c2df5ac7048fb32f1d89a7c2da0929be9d2f5767bc209ca1e99167f196fb5867fc8b69f915c8c349c58089ce3d7e08c9a3f35a73223abff258b9a5bf3466
DIST qemu-10.1.0-docs.tar.xz 2788092 BLAKE2B c9f1138e6eb19966da05b5be6e28640cabf698cb7c4247e0a69b29ed71d462423ba356efc8c0f26a727a58b4adc84edc3eefbff12a35e0c93e475f0ab51e6ff7 SHA512 96d9133d83991014c3ce9a57273a017f45bf29ae3f7029c5b926c8c5fbfd0e8da80dbbecca038b981312cec68b931a0471837a0aebd3e5dbc1648eb49e28ecc9
DIST qemu-10.1.0.tar.xz 141999456 BLAKE2B 025012e73cdd2468b1b0fdef9b34aae41893780cfcad0d52c05e7f67ff7a9969c8c596f006b8a7e6f1b59e39da8fdec07d6f241911c604502755acd26bb750b6 SHA512 20552a524b6b298181df1af7084b470ded3fe8d1505f05011dda3c33cbc3d91f518ce026b44ba1a8b7f34c64ae81afddceda383066f4772a3a2a6333a2638caf
DIST qemu-9.1.0-docs.tar.xz 2376072 BLAKE2B 31d13133b3a2e21a7d9b5af028407610ae8f2fa61dd296fc35e57fc12eb66cfd1a39ec5e3b5a3852095d10a388f424f8a38417b3ab58ca30d0817ece779328cf SHA512 5b705b577daad6aa010d5c713db9dc314114334b89901840ebcecc9032595a969f5ad9054e42b36b2be5ef9f5d6dc1159841ff46dbb08314b5c48491aa631040
DIST qemu-9.1.3.tar.xz 132492084 BLAKE2B 268c8fb91dd5fc4e393a46a578537338861e5d2a92c381517447c6c2fe67604ed9aacc96371c864dc7f4a800cc9b9f94118d17c5dcc24f3fac5be0a18ca553e5 SHA512 e7b938e72eb4a8a4a6680ce3b282a4e5cbd1ad30003bed959e51ea2621acea7434b4366ef6559e3622fac8865ad212702f393ba7698be38cf2fc8f264b951318
DIST qemu-9.2.0-docs.tar.xz 2431076 BLAKE2B 420148b9d7cafbdc9aea21b0d0a84a53ca0d17fb99fc34ae4c0786fa7d4ce40838f4b3173508b90742d6dfbfd4b58dda25b2e5cd1394241b0b56a64fe5705d9b SHA512 88816e326e9eac9acf0a1c73e677552845d6885e220b55e795241c40d2c1bd1b1994a22e56f95046e420225e0b7dc839d459f1c1e5318c8c36392727a86b3008

View File

@ -32,6 +32,7 @@
<flag name="ncurses">Enable the ncurses-based console</flag>
<flag name="nfs">Enable NFS support</flag>
<flag name="numa">Enable NUMA support</flag>
<flag name="passt">Enable TCP/IP in hypervisor via <pkg>net-misc/passt</pkg></flag>
<flag name="pin-upstream-blobs">Pin the versions of BIOS firmware to the version included in the upstream release.
This is needed to sanely support migration/suspend/resume/snapshotting/etc... of instances.
When the blobs are different, random corruption/bugs/crashes/etc... may be observed.</flag>

View File

@ -277,6 +277,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -942,7 +943,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -291,6 +291,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -956,7 +957,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -277,6 +277,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -942,7 +943,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -291,6 +291,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -956,7 +957,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

File diff suppressed because it is too large Load Diff

View File

@ -278,6 +278,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -953,7 +954,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -277,6 +277,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -943,7 +944,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -277,6 +277,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -942,7 +943,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog

View File

@ -16,8 +16,6 @@ QEMU_DOC_USEFLAG="+doc"
PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="ensurepip(-),ncurses,readline"
FIRMWARE_ABI_VERSION="7.2.0"
inherit eapi9-ver flag-o-matic linux-info toolchain-funcs python-r1 udev fcaps \
readme.gentoo-r1 pax-utils xdg-utils
@ -61,11 +59,11 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG}
+fdt fuse glusterfs +gnutls gtk infiniband iscsi io-uring
jack jemalloc +jpeg keyutils
lzo multipath
ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs pipewire
ncurses nfs nls numa opengl +oss pam passt +pin-upstream-blobs pipewire
plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux
+slirp
smartcard snappy spice ssh static-user systemtap test udev usb
usbredir vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
usbredir valgrind vde +vhost-net virgl virtfs +vnc vte wayland X xattr xdp xen
zstd"
COMMON_TARGETS="
@ -209,6 +207,7 @@ SOFTMMU_TOOLS_DEPEND="
media-libs/mesa[egl(+),gbm(+)]
)
pam? ( sys-libs/pam )
passt? ( net-misc/passt )
pipewire? ( >=media-video/pipewire-0.3.60 )
png? ( >=media-libs/libpng-1.6.34:=[static-libs(+)] )
pulseaudio? ( media-libs/libpulse )
@ -239,7 +238,23 @@ SOFTMMU_TOOLS_DEPEND="
zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] )
"
EDK2_OVMF_VERSION="202202"
#
# With USE=+pin-upstream-blobs we pin firmware versions to known good
# version in order to minimize the frequency of disruptive changes. This
# avoids unnecessary frustration on user side because changing the firmware
# version can break resume of hibernated guest, inhibit live migrations,
# and might have other unwanted consequences. For now, let us try to
# synchronize firmware blobs with the ones bundled in upstream qemu. Simply
# check the upstream git repository for any changes, for example:
# https://github.com/qemu/qemu/tree/v10.0.2/roms for the 10.0.2 release.
#
# When changing pinned firmware versions
# - create a separate ebuild with revision -r50
# - update the FIRMWARE_ABI_VERSION to the current package version
#
FIRMWARE_ABI_VERSION="10.0.2"
EDK2_OVMF_VERSION="202408"
SEABIOS_VERSION="1.16.3"
X86_FIRMWARE_DEPEND="
@ -277,6 +292,7 @@ PPC_FIRMWARE_DEPEND="
# See bug #913084 for pip dep
BDEPEND="
$(python_gen_impl_dep)
dev-python/distlib[${PYTHON_USEDEP}]
dev-lang/perl
>=dev-build/meson-0.63.0
app-alternatives/ninja
@ -304,6 +320,7 @@ DEPEND="
${CDEPEND}
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
static-user? ( ${ALL_DEPEND} )
valgrind? ( dev-debug/valgrind )
"
RDEPEND="
${CDEPEND}
@ -555,6 +572,7 @@ qemu_src_configure() {
$(use_enable pulseaudio pa)
$(use_enable selinux)
$(use_enable xattr attr)
$(use_enable valgrind)
)
# Disable options not used by user targets. This simplifies building
@ -617,6 +635,7 @@ qemu_src_configure() {
$(conf_notuser numa)
$(conf_notuser opengl)
$(conf_notuser pam auth-pam)
$(conf_notuser passt)
$(conf_notuser png)
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
@ -942,7 +961,7 @@ pkg_postinst() {
xdg_icon_cache_update
[[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \
fcaps cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
fcaps -m u+s cap_net_admin "${EROOT}"/usr/libexec/qemu-bridge-helper
DISABLE_AUTOFORMATTING=true
readme.gentoo_print_elog
@ -967,8 +986,7 @@ pkg_postinst() {
ewarn "This might break resume of hibernated guests (started with a different"
ewarn "firmware version) and live migration to/from qemu versions with different"
ewarn "firmware. Please (cold) restart all running guests. For functional"
ewarn "guest migration ensure that all"
ewarn "hosts run at least"
ewarn "guest migration ensure that all hosts run at least"
ewarn " app-emulation/qemu-${FIRMWARE_ABI_VERSION}."
fi
}