diff options
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r-- | app-emulation/qemu/Manifest | 10 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch | 18 | ||||
-rw-r--r-- | app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch | 17 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-5.2.0-r2.ebuild | 4 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-5.2.0-r3.ebuild | 13 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-5.2.0-r50.ebuild (renamed from app-emulation/qemu/qemu-5.2.0-r1.ebuild) | 45 | ||||
-rw-r--r-- | app-emulation/qemu/qemu-9999.ebuild | 85 |
7 files changed, 126 insertions, 66 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index dcdc0fca468e..8eecc19c5bc2 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -3,16 +3,16 @@ AUX 65-kvm.rules-r2 204 BLAKE2B 71d062c1d4d0b619220da360b644a0961fc5adb619da379e AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b8367659c2896b7c3dd147e978ef6401b280fc3474bc959bee50f65d7525bee8bc04c19bc657ba7e22f SHA512 a907ee86b81a1b61033bb7621ded65112504131ef7b698c53e4014b958ee6fc79e66f63069015a01e41362cb70a7d0ed26dd9a03033cf776f4846f0e1f8f1533 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab AUX qemu-5.2.0-cleaner-werror.patch 884 BLAKE2B 95404f78f5559f5725c1978e7ef619675817bbe308cd636d6cd9fc43c5ed7440d826c4cb89165fbb275dae3840026b6391e8040b0d21d65120c34b7e41f844e7 SHA512 bdaf7c433c0f10a3666b4f06b680122e4a9bcf41382e50b3f3cb7b236134860ce91864d305282707068763f1521d61d47277579acdf778d6bd4312884eb04d43 +AUX qemu-5.2.0-dce-locks.patch 738 BLAKE2B 121372ed4d812a19f365ec88b584a196548f8ea21b4e6ba6ff899349efa0f3dc8e7b4e77add0adb61fbdb37b814b07a1ca4f39e18b6641aa3a3fd9cf87d6fc8a SHA512 57827809a52b22e585772df47e6d09587730ad172812d663e8f764ce86d922c3dd476724344bb2a3d029f93427f92fd69127355925af67e4b6ba95de716d5888 AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703 AUX qemu-5.2.0-fix-firmware-path.patch 596 BLAKE2B f46890eaa22ac7f94725f5dec86ccabe78f002ef6e4ce6b8f3323362203783ae65f77442634520863abc7a5ed91639c6284ccb53f0ed4f87523c7e45e4a0f186 SHA512 9fe5ed5b72098b0c5b9f9b6ae371ac745de9e269f3713b47ac2bd13d2f03f0827128d43757876f83eeb770dbeeade32db5f10bc9f58d02ed929a45caa5f558ac AUX qemu-5.2.0-no-pie-ld.patch 2929 BLAKE2B 07126013ba465c30fe9ddc8e690e1906d5fa187cf47adcfe94177fe46e6a0365622e938090b23b5517df9e78aa211f4b014939e50503ba8bc09afca5794479ca SHA512 d6cecad4d98fad469dd8514e02372053a99d8077aa4348a36609cf459d7dffa962df937fe0350540ecae4beb274dc1b3c72bce34145474491156ff564104532f AUX qemu-5.2.0-strings.patch 799 BLAKE2B 8f249a647714a4a677d1aca5d8d5c19b27a0e1933877a286017928e01ec23d82e41dc1d196a50ba38bcf4ec8b71fd89c89e41b7c9673faf13935188eebaf4a56 SHA512 481917c8ec9c5089c210f80e719f5a65af1193323ccda4d68bec6afaab0d0e6407cee1d05cd1f3b1bfbd7b7a5f9d2cdb42dd12123813f2c3c51116e999c09288 -AUX qemu-9999-fix-firmware-path.patch 672 BLAKE2B 68849de377ed0134269b89fb3cb896fa42da75aa99aecfed75283b78073fed43dfbafb8bd9c3c0545ebcd943fe86410171f9933965646bb0f2ed901a0720bc6d SHA512 604e6865d206536287f7690179bf7c369e83646742feb9af2a1b46be809c19754e22c2bec430f35cf2e3ef0fc4929541e140d15ddff4a9579db5cf18a3bab1f7 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 DIST qemu-5.2.0.tar.xz 106902800 BLAKE2B 4413d5591cbabf80faba5b0b7347ee7749ff0a71af44bdf7f64b1995e17ecf1f3df539fa8e63959e0d50cd0502a41a2921e60cc6d078ed8ab5b09ab4b86d4ed7 SHA512 bddd633ce111471ebc651e03080251515178808556b49a308a724909e55dac0be0cc0c79c536ac12d239678ae94c60100dc124be9b9d9538340c03a2f27177f3 -EBUILD qemu-5.2.0-r1.ebuild 25296 BLAKE2B a6065977dbf62f928c6dd2bf0c83fbd42f86e23ebcae2c5be2252919d8ad5aeada2cfb82363dd057521ec9436b0f6e3c5ae5d34dbf3ea897d26036b4357990a5 SHA512 8adc01f7f10faa67ebd7ace07bc58c1d6ece5923e6d2a4927bf20e0ffcafb6d3a9f9711630a91346fe9ef56a3f978587f34ecd169b008280aef91bdb2888a84d -EBUILD qemu-5.2.0-r2.ebuild 25477 BLAKE2B a86e886a8395d18d9ea8affbe55807f8418448607a683cc17940a350a0ca120c31b4ec81b18a24bd070487083bfe079707168b7096bbaf29d1bed0572b096957 SHA512 b0459a9c5e1f90793ba531ae9f86321bc779976fe481bf234f551d275b8af188d2cb6041149bcdecf0983c6c3e0621a92fc0aac9f2f2fab03bde56577871a57a -EBUILD qemu-5.2.0-r3.ebuild 25480 BLAKE2B 6cae7d698846231a0b954620b7c198c2ae8f4274fc0a6f5336b6e8accd1455b69ff689efd5b04d31b6cab3355356ab54aa92f2f13dc40cf2540d293b3088d501 SHA512 1687a32a88ac40b8a47f52fc162201959fca3a5f128abe1c2ef31e036d2884b8b2bfba1fac19c66968deaed7f4df6b347db94244b2d40d730c879fb214d7ad1d -EBUILD qemu-9999.ebuild 25436 BLAKE2B 00f618df8f5e63d888562d47f1447fed057fea221896a8ca5ab14e06123e4b26a8b4da39a673718aa36a4d722321bbd76fcf5a369701bb6ac31429969536fdd0 SHA512 7e1803b9a1b300f8bc69e0da5c96ed4e6104e9ef021c4813b983245b0478816ac9d194dbd2e3ff7e59aae5b213803c7fa39b435e15e37400be7ba10476668b63 +EBUILD qemu-5.2.0-r2.ebuild 25477 BLAKE2B ebcbdb6a2d54cf8736bceabef649afaedc23e451debd68b871b4843463c10df0065d7377ceff6f8d019d4fcf0bdf086ab481daf9f6c4bbf4056f846f84ad9c3b SHA512 0a3cb9ab6b1d9ccbf2e9b2734dc00ab163c1dbc995c5a274bb07df63aa885cdd5a6b5246019d4ad43e064845c4f6dca39c5e71f412275d87249e7047433762a0 +EBUILD qemu-5.2.0-r3.ebuild 25638 BLAKE2B d7b226e1998f6893c26cc7264b0f5fe713d3bedb2ac1a194cc8479de50c403295cb4f8fcb17afe1b02d8e2802c8161d39c574914be79f2aec9597b575de576aa SHA512 aecc7662e36c282c4d4a114285a7396f66b150d2e787678fdd9081b5bb18169184f8dfacbb85961d7bd711dcd1e82438290daa84709bbeb04e9f9153613ee504 +EBUILD qemu-5.2.0-r50.ebuild 25749 BLAKE2B 89c755160de4ecb4a7f73218bc6d8a6713984d199dcbbbc88d5d520f4c8712c75419e57b4f64b8a4a2519a9665c6aef081541585b306e677f348306e7e665197 SHA512 1f62f7af804ce6380495fccdb936819beed77ff7d8c76d5901dfebe0078851511d1e70b45b892dae4e56bf64d8305842457e110118118fe9508fb8a0a299ba13 +EBUILD qemu-9999.ebuild 25546 BLAKE2B 935bb420930bf9f6acc34d71edc2325e9419fea79f87af5284df97b76f9050dd03264ac2748d31cd079a74cccadc4cb5f1270ac1d14ea3f36d9c5093a660502a SHA512 4bd274042fc00c41850fef692f1de466e3237b2437c75855c3518e2b0ce30f4bd20cbf5daf6bd60e2e71497645504a6d201a96aa8c333719b87b2abaa6119dda MISC metadata.xml 4347 BLAKE2B c82480d51523c9f3c1d78a1eb4bfda0319b1f7e4c1576df7588fe87d7746554dc585e86ecc04d58b5f41e72f9233bfbccbc62bab20171202dabf308a2ca200d5 SHA512 a317c1a529336c0dee2e06709654d7aeb283e27d6bec1a335b3bda151ca255e5a2e5d25a940bee9aadbe0ee1c15cd9ac07248552b6156f4f3c31f06354d0e05d diff --git a/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch new file mode 100644 index 000000000000..679a9f391b0b --- /dev/null +++ b/app-emulation/qemu/files/qemu-5.2.0-dce-locks.patch @@ -0,0 +1,18 @@ +Fix CFLAGS=-Og build break. -Og fails because gcc does not enable dead +code elimination (but does set __OPTIMIZE__ define). + +The fix avoids DCE reliance downstream entirely. + +Reported-by: Luke-Jr +Bug: https://bugs.gentoo.org/782364 +--- a/include/qemu/lockable.h ++++ b/include/qemu/lockable.h +@@ -28,7 +28,7 @@ struct QemuLockable { + * to QEMU_MAKE_LOCKABLE. For optimized builds, we can rely on dead-code elimination + * from the compiler, and give the errors already at link time. + */ +-#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) ++#if defined(__OPTIMIZE__) && !defined(__SANITIZE_ADDRESS__) && defined(VALIDATE_LOCKS_VIA_DCE) + void unknown_lock_type(void *); + #else + static inline void unknown_lock_type(void *unused) diff --git a/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch b/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch deleted file mode 100644 index ffff31402b6c..000000000000 --- a/app-emulation/qemu/files/qemu-9999-fix-firmware-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Set absolute filename in files like - /usr/share/qemu/firmware/50-edk2-x86_64-secure.json - -Bug: https://bugs.gentoo.org/766743 -Bug: https://bugs.launchpad.net/qemu/+bug/1913012 -Patch-by: Jannik Glückert ---- a/pc-bios/descriptors/meson.build -+++ b/pc-bios/descriptors/meson.build -@@ -9,7 +9,7 @@ if install_edk2_blobs - ] - configure_file(input: files(f), - output: f, -- configuration: {'DATADIR': qemu_datadir}, -+ configuration: {'DATADIR': get_option('prefix') / qemu_datadir}, - install: get_option('install_blobs'), - install_dir: qemu_datadir / 'firmware') - endforeach diff --git a/app-emulation/qemu/qemu-5.2.0-r2.ebuild b/app-emulation/qemu/qemu-5.2.0-r2.ebuild index 38fe3834e894..f8958f1829c3 100644 --- a/app-emulation/qemu/qemu-5.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r2.ebuild @@ -23,7 +23,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc ~ppc64 x86" + KEYWORDS="amd64 arm64 ~ppc ppc64 x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -32,7 +32,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath diff --git a/app-emulation/qemu/qemu-5.2.0-r3.ebuild b/app-emulation/qemu/qemu-5.2.0-r3.ebuild index 62b50afd5d93..c92538311582 100644 --- a/app-emulation/qemu/qemu-5.2.0-r3.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r3.ebuild @@ -8,8 +8,9 @@ PYTHON_REQ_USE="ncurses,readline" FIRMWARE_ABI_VERSION="4.0.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 +inherit flag-o-matic if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" @@ -23,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -32,7 +33,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath @@ -359,6 +360,10 @@ check_targets() { } src_prepare() { + # workaround -fcommon breakage: bug #726560 + [[ ${PV} == 5.2.0 ]] || die "Check if -fcommon hack is needed" + filter-flags -fcommon + check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user diff --git a/app-emulation/qemu/qemu-5.2.0-r1.ebuild b/app-emulation/qemu/qemu-5.2.0-r50.ebuild index 40e426156511..7a9f08f85398 100644 --- a/app-emulation/qemu/qemu-5.2.0-r1.ebuild +++ b/app-emulation/qemu/qemu-5.2.0-r50.ebuild @@ -6,10 +6,11 @@ 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 +inherit flag-o-matic if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" @@ -23,7 +24,7 @@ if [[ ${PV} = *9999* ]]; then SRC_URI="" else SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc ppc64 x86" + KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -32,7 +33,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath @@ -169,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-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 )" -PPC64_FIRMWARE_DEPEND=" +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] ) " @@ -210,7 +213,8 @@ CDEPEND=" ) qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_ppc64? ( ${PPC64_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc? ( ${PPC_FIRMWARE_DEPEND} ) + qemu_softmmu_targets_ppc64? ( ${PPC_FIRMWARE_DEPEND} ) " DEPEND="${CDEPEND} kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 ) @@ -228,6 +232,9 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-5.2.0-strings.patch + "${FILESDIR}"/${PN}-5.2.0-fix-firmware-path.patch + "${FILESDIR}"/${PN}-5.2.0-no-pie-ld.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch ) QA_PREBUILT=" @@ -356,6 +363,10 @@ check_targets() { } src_prepare() { + # workaround -fcommon breakage: bug #726560 + [[ ${PV} == 5.2.0 ]] || die "Check if -fcommon hack is needed" + filter-flags -fcommon + check_targets IUSE_SOFTMMU_TARGETS softmmu check_targets IUSE_USER_TARGETS linux-user @@ -723,7 +734,7 @@ src_install() { [[ -e check-report.html ]] && dodoc check-report.html if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r1 65-kvm.rules + udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules fi if use python; then @@ -766,8 +777,8 @@ src_install() { rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" rm "${ED}/usr/share/qemu/vgabios-virtio.bin" rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # PPC64 loads vgabios-stdvga - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc64; then + # PPC/PPC64 loads vgabios-stdvga + if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 || use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64; then dosym ../seavgabios/vgabios-isavga.bin /usr/share/qemu/vgabios.bin dosym ../seavgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin dosym ../seavgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index b46e4085ed53..9970b1a031f7 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" @@ -32,7 +32,7 @@ HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org" LICENSE="GPL-2 LGPL-2 BSD-2" SLOT="0" -IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc +IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug +doc +fdt glusterfs gnutls gtk infiniband iscsi io-uring jack jemalloc +jpeg kernel_linux kernel_FreeBSD lzo multipath @@ -43,14 +43,55 @@ IUSE="accessibility +aio alsa bzip2 capstone +caps +curl debug doc usbredir vde +vhost-net vhost-user-fs virgl virtfs +vnc vte xattr xen xfs zstd" -COMMON_TARGETS="aarch64 alpha arm cris hppa i386 m68k microblaze microblazeel - mips mips64 mips64el mipsel nios2 or1k ppc ppc64 riscv32 riscv64 s390x - sh4 sh4eb sparc sparc64 x86_64 xtensa xtensaeb" -IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} - avr lm32 moxie rx tricore unicore32" -IUSE_USER_TARGETS="${COMMON_TARGETS} - aarch64_be armeb mipsn32 mipsn32el ppc64abi32 ppc64le sparc32plus - tilegx" +COMMON_TARGETS=" + aarch64 + alpha + arm + cris + hppa + i386 + m68k + microblaze + microblazeel + mips + mips64 + mips64el + mipsel + nios2 + or1k + ppc + ppc64 + riscv32 + riscv64 + s390x + sh4 + sh4eb + sparc + sparc64 + x86_64 + xtensa + xtensaeb +" +IUSE_SOFTMMU_TARGETS=" + ${COMMON_TARGETS} + avr + lm32 + moxie + rx + tricore + unicore32 +" +IUSE_USER_TARGETS=" + ${COMMON_TARGETS} + aarch64_be + armeb + hexagon + mipsn32 + mipsn32el + ppc64abi32 + ppc64le + sparc32plus +" use_softmmu_targets=$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS}) use_user_targets=$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS}) @@ -169,25 +210,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] ) " @@ -229,7 +272,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-strings.patch "${FILESDIR}"/${PN}-5.2.0-cleaner-werror.patch "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - "${FILESDIR}"/${PN}-9999-fix-firmware-path.patch + "${FILESDIR}"/${PN}-5.2.0-dce-locks.patch ) QA_PREBUILT=" @@ -495,7 +538,7 @@ qemu_src_configure() { $(conf_notuser vhost-user-fs) $(conf_tools vhost-user-fs virtiofsd) $(conf_notuser virgl virglrenderer) - $(conf_notuser virtfs) + $(conf_softmmu virtfs) $(conf_notuser vnc) $(conf_notuser vte) $(conf_notuser xen) |