diff options
Diffstat (limited to 'app-emulation')
35 files changed, 182 insertions, 2161 deletions
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz Binary files differindex b59cc10d5602..2e2fc7982dbe 100644 --- a/app-emulation/Manifest.gz +++ b/app-emulation/Manifest.gz diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest index b4532b2a0694..7f07dc8e60de 100644 --- a/app-emulation/cloud-init/Manifest +++ b/app-emulation/cloud-init/Manifest @@ -9,4 +9,4 @@ DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 74e07649a24fc85df54aafcd72797a05f0bd EBUILD cloud-init-20.4.ebuild 2620 BLAKE2B da53cd675b21b9140ff603850dcce985990c9a1f5c90bd4be4524f6649788485b417217ab3450a7a47a6cf110bddc8823775367d109c1ad66beccc7ee94feef0 SHA512 b6d4df6d9dff2970710aedd30b1552490218ccf9067c972465a3f5b0ef2597e7b6a5f36ca3f1c98b0496f2c5da95ecea541a52557b426d7c30b82473857a1a66 EBUILD cloud-init-21.2.ebuild 2634 BLAKE2B fd45521ef7b88a74144780b5e3f938385ceec3f91e390fc22c868da72a781e77d787d1ac764d0ac632bddd86fe41e2d768405ac886fff575bed0297e415e1545 SHA512 19b64946f0b7d881dd9db21eb332d8dca1e71e5674346405aeba0546ce55227694c77ffec2944d66e3e8f0b4284dfd8e036b88276c55d8383b2a61b104cc8fb2 EBUILD cloud-init-9999.ebuild 2636 BLAKE2B ecc028c023e898f70c75ece9fe6355c3dc6edd0c61a098b83124ba026e1836f1de32715e2c85db407df0caa1813126db05b2ccf0ebf07b7e5c971f173b3c1947 SHA512 74dc1bddb1a6c0740d13f653eadb6f034af41243137316e0238c778e942af5cb9669324e00a409fb9d9f04a26d4ac1d49876d15fbadcd741caeff3600a29bce3 -MISC metadata.xml 770 BLAKE2B 7f30338c60ff3ae14e37b97dc046397de9e694c7154dd51c3a01c2ffe3bbb6055661b0ea3b767d1f3740ef0d772f27721dabcbd6e02ca04269b4711951a8a02b SHA512 e76dfba886320f9b711fbd87dd0202c69142c720700065997f786c0237a2d3f591d83442f24752d37b19c98b524d8e1e33bdb6905be3f6b8a4728264452a2514 +MISC metadata.xml 652 BLAKE2B 3cdf1331c7ae5065c1cbe4211acb44ed5b633a97add66b70e26fcebef19461fb6bddf06c455369f03b45d3a12a4214b02aa60463c39c38b527db634e883872a5 SHA512 ff07770f741ea072d1e0007856ed7af1a55f2e6e879cf8ba39039ef0dd148c078438d87e0ae14acc4b8a1fb42429abaaf53a7467473aca587dc5ee6b1b266af5 diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml index b713df4f675f..f64358336851 100644 --- a/app-emulation/cloud-init/metadata.xml +++ b/app-emulation/cloud-init/metadata.xml @@ -5,10 +5,6 @@ <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> - <maintainer type="person"> - <email>eva@gentoo.org</email> - <name>Gilles Dartiguelongue</name> - </maintainer> <longdescription lang="en"> Cloud-init is the industry standard multi-distribution method for cross-platform cloud instance initialization. It is supported across all major public cloud providers, provisioning systems for private cloud infrastructure, and bare-metal installations. </longdescription> diff --git a/app-emulation/glean/Manifest b/app-emulation/glean/Manifest index b23d088c28a9..ff51a69940c5 100644 --- a/app-emulation/glean/Manifest +++ b/app-emulation/glean/Manifest @@ -1,4 +1,6 @@ AUX glean.initd 241 BLAKE2B ea451713203da8dd61eef5155e2ab2d5fa7be5d9cd210ce2d0ce890fe54af05b461671702d1a2b60b8e6b8e0cb0f4d12f90ff2884409e9f2a3dcc380ba48bb60 SHA512 a5af77b16e1864158dfe858f932dd4eecb5633bd71fbdd00085863e56bd1862d7eba4500d0f4ac8c692b06750fcfe3f9f5b2bb7a4ca6a4ba72dbc43bb12856c5 DIST glean-1.18.2.tar.gz 67642 BLAKE2B b346fc63b361e7c7bf0b8fc100da4a047004950aff3e17fce96d47ae5a7887828a09f4b107f2af1afcf9d866e5bc0857049ddd2d9c49413e9fe4b61d1de99fd3 SHA512 de80c06952ebbbc24c8cf198f61be788fb32974652c8253787ed5a165e26bb162b48c84836779420bb7c331edeb50a7796f5a2ff578d2e612068c5fbadd343c7 -EBUILD glean-1.18.2.ebuild 594 BLAKE2B 37d1256760eebac23b04623ac55a053f3b736239c04398da7c04e1a6c18a73c0d8ed77166dcd24497d0d803c659637a844810d4d1e522f6887c2a118003ccabb SHA512 31c863490274f539320ca4dc202c435354d28f8bc5c5bfe4926f1a33102b32c444e6843753593a63272ad1a47cf442c3842a4fc8a306f4d83b22815ae211f2a5 +DIST glean-1.19.0.tar.gz 68806 BLAKE2B 14569fafe05ee0abd626c8302d54721d321b1c69bd0e72bb850c2fab7d7c49a0c5f27c20e4542e5c32a818d51f1fc29e8a14ff730ebbc4619399e710e6b9f9d4 SHA512 a4d063a921f6dac51d2e610121d359f289817cf57a52fadd6b8fd2c8c7f761433920c5d43b415edcaf3c4956bb67b3c19274aa6ec061b057a6bcb975d2662cd0 +EBUILD glean-1.18.2.ebuild 583 BLAKE2B ef1f2f39b65bca15a5d2ed9ffec7b18595f6ac22d58e406544f693eaccb953f7ff2c1c7168b29dbb5b6ff2f410abb01d28d223a36256a8d031bb5ab6d8cfe03a SHA512 678b4218234ba65d95b9cf8d62a79ae8c9c26de8cc258990754e6a533cb7f87e9377476b9aecf86e4823eaaa97ca36962009f640a483b7461eec0c99662a3b8d +EBUILD glean-1.19.0.ebuild 585 BLAKE2B 3638fd76040326d2494fc5105a0525df8a7c2c239a1b91a04e4d15916d3fc984b7796917e35f9ff38b06aab90489a37f94a3d858a8e542b59ec4c57e3ec09157 SHA512 6c85f871f086ab03752b3292e55b9c3d246b321ae80c425e0c6de00301448f30464389afb84862f94d60803a27451ce4a77a41fd648d9ddd066d46df5b494ad7 MISC metadata.xml 698 BLAKE2B a0702c57b38fbe6c2f8493833895d6a411ac75d35b6e216338dd51fb2f13dc35756174ad8f5b6e36ec584046973fb8644cc32c0c010184f945065fe58eb95d1e SHA512 4e9e178d4030e02fa469412886fb40cecebc4611daf31028840a36b55521992c278780f7a5cd1dd57faa4d98eabcdd7bdc925aacfed3aa3235c87f1906259e26 diff --git a/app-emulation/glean/glean-1.18.2.ebuild b/app-emulation/glean/glean-1.18.2.ebuild index edd0b4838797..bd5b679fef7c 100644 --- a/app-emulation/glean/glean-1.18.2.ebuild +++ b/app-emulation/glean/glean-1.18.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_7 python3_8 python3_9 ) +PYTHON_COMPAT=( python3_{7,8,9,10} ) DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 diff --git a/app-emulation/glean/glean-1.19.0.ebuild b/app-emulation/glean/glean-1.19.0.ebuild new file mode 100644 index 000000000000..2d07441e5a1c --- /dev/null +++ b/app-emulation/glean/glean-1.19.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9,10} ) +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 + +DESCRIPTION="Simple program to write static config from config-drive" +HOMEPAGE="https://opendev.org/opendev/glean" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-python/pbr[${PYTHON_USEDEP}]" +RDEPEND="${DEPEND}" + +src_install() { + distutils-r1_src_install + newinitd "${FILESDIR}/${PN}.initd" ${PN} +} diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest index 6a8b84d9a927..4707f2661144 100644 --- a/app-emulation/qemu/Manifest +++ b/app-emulation/qemu/Manifest @@ -3,18 +3,13 @@ AUX bridge.conf 454 BLAKE2B 2f3e828a001ac77de96c8a11e3fc462149e1c16972c28b836765 AUX qemu-2.11.1-capstone_include_path.patch 264 BLAKE2B 955b498c0ea2657ee4c9d0054a32693ac2096232ae8358848fa8518bcb87c1cce5d9145ccf560320ba53d60ae8ed85f6be801b72707a964b247e8f1f1844f9cd SHA512 ebf1d6450b7c499a8e490b19f87a3b4f8bbc50ea44edaac8c12b0993947513a8b616af2d4cf6240c8e265824a44463f917333ffa510e6ffedf379921e28fc3ab AUX qemu-5.2.0-disable-keymap.patch 884 BLAKE2B dbbe245a52615f8894cbac1c94ce3fee2051b1c54def32ec6ad43dedfe8190d02937c28ce93d93eeb13fe82f2ac2df52bec375501e83af53624d8292f8208fe3 SHA512 f84c6f37ce742201b63b308bef5fdaf1dc50e77e0dcf164e85284e338ed7bd861fc0e147fb88668b056ab0f15b4e6cbefbfb2cd2bafeb002c281ae88d08f9703 AUX qemu-6.0.0-make.patch 306 BLAKE2B 701c6d929dc7544a2e155243a2545dc488765cf8b733fca29c4f4cb06cad732d72f64c330d95fbcdcf12b174b92b7fa5b713bf833065e5014f8aed1eec22c0a1 SHA512 5d22c6c4085dd0bf58752e21af9addd6a1a670a60f172b488d1ccfb1b9356ce9808a3b9337dd1bd2aa9e06735a3c7a465bc11ae3871cc4294ec609729b2e09c7 -AUX qemu-6.1.0-automagic-libbpf.patch 887 BLAKE2B 9c74ea440dbd958368ae41b4d39cf869fa34f70493c7e79d5be31309d343cb35b8061c9d99f3b5e7bfcf99f4cc590d9b4854b12f109a8dd247922d7a07aa68bf SHA512 76fcb4d280cd0c7f7610b55154d987501597b823f286110e0ae756ae6bb541193423f942ce6d4f8fefdc42d1727b8689142dd50f186689427afef18adb5f62b5 -AUX qemu-6.1.0-data-corruption.patch 4758 BLAKE2B b05ad66a0f3c1ef18ec33a602181053563e4459cf29f41b34bf27df4c443afacfe217c5e909870471ae887c0fd43ba453083b0d1b615fc265bca448bc26f1379 SHA512 19bb220b5860d8d99b8211e54616f34335c4ebcf573252f5f704deef312f840f6b847278067d07b31ebf5c4a044b67c647fab5137d6ad7f2dc2d2a7f0e901714 -AUX qemu-6.1.0-fix-unix-socket-copy.patch 3117 BLAKE2B d39d64013b4820d6c075a2aa8dd88b1355599fed641e3a5aaef726d49268ab88046e0cb55bf0c0c6f71b7fc4bf08d42e17b2a374aeb9c24498ccd9d609e71121 SHA512 091369dadeac2546fbdb9c1b71380f43fc927e4b17306505e47bbe022ac8b9087e0fd902667a1adf2808a7581135da1cefbbb89cad2275f6192d77b260fc442b AUX qemu-6.1.0-strings.patch 882 BLAKE2B 9c35aca28371c15e037af5e9deaa90edcad769b5346f7c90cbb7768ce5639b1d1d1204933024241b7349573cc94ebca7a85ebaf051a9fb9dab8ea7d87d843ef9 SHA512 fcbf02a38401dbc7612130bb993dbec72468c926f729cd32e822b39fefe446ed8fd0906d6ffd4557181df753a84d77182fa713a5939300f193008532be88ada4 +AUX qemu-6.2.0-also-build-virtfs-proxy-helper.patch 1052 BLAKE2B 737442df84f3f852be356dc32748b20da6a548d2ff51871c24fe32ab7589e8b69d5d767514db5d1087b59a45719808ed30479d9ef1c7ba52901305d2a87ad8e2 SHA512 095dcfa37d0b4c461ab5a6358a4e2c6fd9d44b2ea1977ce0aa9eed88bc8d4cbe213f7261b1724ce1dc0896782f2815bfb12a420a338ec3409fdf554b10516f34 AUX qemu-6.2.0-user-SLIC-crash.patch 6998 BLAKE2B ae8bcd4d729f9a60e9c2680f7c04fe6dc9d644f8f17d4b63628c59d52b0ca2ba8ac31aa49efc57c28259bb368e796faeb37928ef69d5255b889a4c9149506736 SHA512 1ce190cd3cd56f1a1567e26ecd785fa8d66c15bbc3e091d5fbf200ced7b074f8e5cd8fd8e19a2b35a1f6c5f9617bba131ee2b197f44cc5d6551247e9ae252716 AUX qemu-binfmt.initd.head 1442 BLAKE2B 23aa5338914aa7c47f9b1cc1d28291abd0ea037a33cca81f990decfafac2907c86c042350c9dd45591d16330846d4e11d2c8a2a409a68ad81656d9c2c51964c0 SHA512 3fec8946a37bfbd2089f5d95089ed5987a198fc0139ee7482d4bb38c2ffa0e165667a7853afcf2b458bc3e2a6540f172c929ca5a334a00db47e2d0f881382c0e AUX qemu-binfmt.initd.tail 245 BLAKE2B dd59f2944c6e3f0c4d282b94b687a9b5c51dd77c5103fb9889bd9ce56874495397676ae6c8375d9e9e23094828477240778d9e0f361e68cdd63fdad574851561 SHA512 bcca16805f8380d52cc591ea3d65a8f6e5de456730618f6aee301510edb75d235a22d4d7aeed224882210392840adb403eb53234b6cb76a4cb24533852a8b737 -DIST qemu-6.1.0.tar.xz 111258808 BLAKE2B 412eecf6d39debd6089b26d3b22e5d25c6c8c30d2eaf31b17c25cc2b3a1b10794a30218dfb151c78801aa295255aa974b297f1fe05b93f14334f203c2af5ccee SHA512 3378ae21c75b77ee6a759827f1fcf7b2a50a0fef07e3b0e89117108022a8d8655fa977e4d65596f4f24f7c735c6594d44b0c6f69732ea4465e88a7406b1d5d3c DIST qemu-6.2.0.tar.xz 115667324 BLAKE2B 3f2f02e5c36113df6231a9474c6d5db774e541312173813c28f578d669a51f391695d364dc806f5906d9e3c2796bb20b2606fcd46a247eb751ea517de9d7ce15 SHA512 e9f8231c9e1cfcc41cb47f10a55d63f6b8aee307af00cf6acf64acb7aa4f49fa7e9d6330703a2abea15d8b7bbaba7d3cb08c83edd98d82642367b527df730817 -EBUILD qemu-6.1.0-r3.ebuild 25662 BLAKE2B a9630690c49961e1a2a927230356369a0736912f9f90bcdcc84f5b1fe5d6aedd0783849833b626812af397854d7fe386e888c30ad2458f5cbfc4d477417c34e4 SHA512 420818ef14244f0b6eaa24510bd2411261049e546b268964830cd1150a1fef31c97a4e047fe6992bb6f14aab4dbdc6e2719c13c7a0a50a88109f2c55028a0bd8 -EBUILD qemu-6.2.0-r1.ebuild 25904 BLAKE2B 4391b619b996a9a192e23d15ae8d563dfc29573011634c8e1f261495da920eb276bf89b9b5c97b6e5be2f81ac2deb94c86215f374c8095c9e8c72ca8c902bd68 SHA512 b0ee436a1fa5ca401dc81f5afb6939cbc9443de8cea365c28c62b5ef03cce12375939f8ffce8426fbebc6dd2d4e6ea61d50c10c98ee77480fcd11d13cdf10217 -EBUILD qemu-6.2.0-r2.ebuild 25991 BLAKE2B a1466111632b6e17767a49900b7d7bc82cedade982c404af959f973d6f3c9b39d9c14e086c108a681ab7db3681188280769ddbbda5e70721ca65e0275227fb08 SHA512 81e75657263cda1c158e8bd92ccb629d075d63eaa08a35c6c67b87e05bb4931d15798535042a86e393100f3e9606820be88397ca85455f6d3cb9deb9412d17ca +EBUILD qemu-6.2.0-r3.ebuild 26060 BLAKE2B ad3291ea714270a3ac6d7d52bb8721536cd0a131ecfce763a46a6dcdbed1ec5f1d4a207e29968f2435ca9ef6499cc8696a0e89948d0568d55ad4695bed7e622d SHA512 941ffdb8b38badfe4f5716ae5e465e59312186b4bf6bce99ad2fbc8903beaf7ddae293f80295559a5b3736c844d9c48803ca3e873015ad94fbadab2bd2f79054 EBUILD qemu-6.2.0.ebuild 25693 BLAKE2B 3cf29a95b24e1a1c777605d793caa8c9bc684e1ef37ce9fe8f55988fa5aa29ea140343a405755a07cb313f9a7e3dac42d10543797b41f70b8711cefc02b0e501 SHA512 d2243ffaeeb92d02717863b1dc09db06eaefdca17a934914b5f2d00fa3429f2ac52a154661ac7937cf0703f4392fb19eb1cde9402a88a5d79c5e9d89463199a4 -EBUILD qemu-9999.ebuild 25942 BLAKE2B 140e043acc2c845e6c877e88097498fef09c554ce7ca819e26ecad4605b5d454e074394dc78e4df2b65fee2f016316e47e01713646aa5fa9bae8db0b1856efd4 SHA512 d5956f8bd2ba4af79475512599f41b17192b6d696c45b59a0e4ec9034843593c1b8968177a1a781a51fd4cf5e562f430463220c078d3f4bd42fd439d0762d7b2 +EBUILD qemu-9999.ebuild 26006 BLAKE2B 294a7f2f8b40867a589572646fad3e3e2f61f1ea704ffae14c36e619df180a261f8448a986c974f80ea1d00807be52103c7add6882c43742382e2a38e13ee310 SHA512 bffea46b6aecbd1eceb5e1a638c8bf36587859066d08270afe6189745debe9188bbc9721176e3c44d4ffdaefbca04d32594f9a9a581bf18234d21309616413c0 MISC metadata.xml 4590 BLAKE2B 420dff5c9595ed662f5c5963543d63e768b4db9b77518a1d84dca09daef2b6b2c5c089955804af9277cd26533eac8148b93c9d1c2c9cc4285d141a321af2b6e1 SHA512 9c85bf9834eaf1b450807931c05a32c843a247b614ecb26e82151828a5c4be2d95510119b7431c563d3ac5d48126ffc99e9cb654d94f361e4c2d2c7fc6347dcc diff --git a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch b/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch deleted file mode 100644 index d067650dc8fa..000000000000 --- a/app-emulation/qemu/files/qemu-6.1.0-automagic-libbpf.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 080832e4f4801a28bd1170c49e61f6a0f5f05d03 -Author: Paolo Bonzini <pbonzini@redhat.com> -Date: Tue Sep 7 12:45:12 2021 +0200 - - ebpf: only include in system emulators - - eBPF files are being included in user emulators, which is useless and - also breaks compilation because ebpf/trace-events is only processed - if a system emulator is included in the build. - - Resolves: https://gitlab.com/qemu-project/qemu/-/issues/566 - Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> - Signed-off-by: Jason Wang <jasowang@redhat.com> - -diff --git a/ebpf/meson.build b/ebpf/meson.build -index 9cd0635370..2dd0fd8948 100644 ---- a/ebpf/meson.build -+++ b/ebpf/meson.build -@@ -1 +1 @@ --common_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) -+softmmu_ss.add(when: libbpf, if_true: files('ebpf_rss.c'), if_false: files('ebpf_rss-stub.c')) diff --git a/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch b/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch deleted file mode 100644 index 25c788426a9c..000000000000 --- a/app-emulation/qemu/files/qemu-6.1.0-data-corruption.patch +++ /dev/null @@ -1,114 +0,0 @@ -commit cc071629539dc1f303175a7e2d4ab854c0a8b20f -Author: Paolo Bonzini <pbonzini@redhat.com> -Date: Thu Sep 23 09:04:36 2021 -0400 - - block: introduce max_hw_iov for use in scsi-generic - - Linux limits the size of iovecs to 1024 (UIO_MAXIOV in the kernel - sources, IOV_MAX in POSIX). Because of this, on some host adapters - requests with many iovecs are rejected with -EINVAL by the - io_submit() or readv()/writev() system calls. - - In fact, the same limit applies to SG_IO as well. To fix both the - EINVAL and the possible performance issues from using fewer iovecs - than allowed by Linux (some HBAs have max_segments as low as 128), - introduce a separate entry in BlockLimits to hold the max_segments - value from sysfs. This new limit is used only for SG_IO and clamped - to bs->bl.max_iov anyway, just like max_hw_transfer is clamped to - bs->bl.max_transfer. - - Reported-by: Halil Pasic <pasic@linux.ibm.com> - Cc: Hanna Reitz <hreitz@redhat.com> - Cc: Kevin Wolf <kwolf@redhat.com> - Cc: qemu-block@nongnu.org - Cc: qemu-stable@nongnu.org - Fixes: 18473467d5 ("file-posix: try BLKSECTGET on block devices too, do not round to power of 2", 2021-06-25) - Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> - Message-Id: <20210923130436.1187591-1-pbonzini@redhat.com> - Signed-off-by: Kevin Wolf <kwolf@redhat.com> - -diff --git a/block/block-backend.c b/block/block-backend.c -index 6140d133e2..ba2b5ebb10 100644 ---- a/block/block-backend.c -+++ b/block/block-backend.c -@@ -1986,6 +1986,12 @@ uint32_t blk_get_max_transfer(BlockBackend *blk) - return ROUND_DOWN(max, blk_get_request_alignment(blk)); - } - -+int blk_get_max_hw_iov(BlockBackend *blk) -+{ -+ return MIN_NON_ZERO(blk->root->bs->bl.max_hw_iov, -+ blk->root->bs->bl.max_iov); -+} -+ - int blk_get_max_iov(BlockBackend *blk) - { - return blk->root->bs->bl.max_iov; -diff --git a/block/file-posix.c b/block/file-posix.c -index c62e42743d..53be0bdc1b 100644 ---- a/block/file-posix.c -+++ b/block/file-posix.c -@@ -1273,7 +1273,7 @@ static void raw_refresh_limits(BlockDriverState *bs, Error **errp) - - ret = hdev_get_max_segments(s->fd, &st); - if (ret > 0) { -- bs->bl.max_iov = ret; -+ bs->bl.max_hw_iov = ret; - } - } - } -diff --git a/block/io.c b/block/io.c -index 18d345a87a..bb0a254def 100644 ---- a/block/io.c -+++ b/block/io.c -@@ -136,6 +136,7 @@ static void bdrv_merge_limits(BlockLimits *dst, const BlockLimits *src) - dst->min_mem_alignment = MAX(dst->min_mem_alignment, - src->min_mem_alignment); - dst->max_iov = MIN_NON_ZERO(dst->max_iov, src->max_iov); -+ dst->max_hw_iov = MIN_NON_ZERO(dst->max_hw_iov, src->max_hw_iov); - } - - typedef struct BdrvRefreshLimitsState { -diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c -index 665baf900e..0306ccc7b1 100644 ---- a/hw/scsi/scsi-generic.c -+++ b/hw/scsi/scsi-generic.c -@@ -180,7 +180,7 @@ static int scsi_handle_inquiry_reply(SCSIGenericReq *r, SCSIDevice *s, int len) - page = r->req.cmd.buf[2]; - if (page == 0xb0) { - uint64_t max_transfer = blk_get_max_hw_transfer(s->conf.blk); -- uint32_t max_iov = blk_get_max_iov(s->conf.blk); -+ uint32_t max_iov = blk_get_max_hw_iov(s->conf.blk); - - assert(max_transfer); - max_transfer = MIN_NON_ZERO(max_transfer, max_iov * qemu_real_host_page_size) -diff --git a/include/block/block_int.h b/include/block/block_int.h -index ffe86068d4..f4c75e8ba9 100644 ---- a/include/block/block_int.h -+++ b/include/block/block_int.h -@@ -718,6 +718,13 @@ typedef struct BlockLimits { - */ - uint64_t max_hw_transfer; - -+ /* Maximal number of scatter/gather elements allowed by the hardware. -+ * Applies whenever transfers to the device bypass the kernel I/O -+ * scheduler, for example with SG_IO. If larger than max_iov -+ * or if zero, blk_get_max_hw_iov will fall back to max_iov. -+ */ -+ int max_hw_iov; -+ - /* memory alignment, in bytes so that no bounce buffer is needed */ - size_t min_mem_alignment; - -diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h -index 29d4fdbf63..82bae55161 100644 ---- a/include/sysemu/block-backend.h -+++ b/include/sysemu/block-backend.h -@@ -211,6 +211,7 @@ uint32_t blk_get_request_alignment(BlockBackend *blk); - uint32_t blk_get_max_transfer(BlockBackend *blk); - uint64_t blk_get_max_hw_transfer(BlockBackend *blk); - int blk_get_max_iov(BlockBackend *blk); -+int blk_get_max_hw_iov(BlockBackend *blk); - void blk_set_guest_block_size(BlockBackend *blk, int align); - void *blk_try_blockalign(BlockBackend *blk, size_t size); - void *blk_blockalign(BlockBackend *blk, size_t size); diff --git a/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch b/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch deleted file mode 100644 index 7701b26b4f9a..000000000000 --- a/app-emulation/qemu/files/qemu-6.1.0-fix-unix-socket-copy.patch +++ /dev/null @@ -1,76 +0,0 @@ -commit 118d527f2e4baec5fe8060b22a6212468b8e4d3f -Author: Michael Tokarev <mjt@tls.msk.ru> -Date: Wed Sep 1 16:16:24 2021 +0300 - - qemu-sockets: fix unix socket path copy (again) - - Commit 4cfd970ec188558daa6214f26203fe553fb1e01f added an - assert which ensures the path within an address of a unix - socket returned from the kernel is at least one byte and - does not exceed sun_path buffer. Both of this constraints - are wrong: - - A unix socket can be unnamed, in this case the path is - completely empty (not even \0) - - And some implementations (notable linux) can add extra - trailing byte (\0) _after_ the sun_path buffer if we - passed buffer larger than it (and we do). - - So remove the assertion (since it causes real-life breakage) - but at the same time fix the usage of sun_path. Namely, - we should not access sun_path[0] if kernel did not return - it at all (this is the case for unnamed sockets), - and use the returned salen when copyig actual path as an - upper constraint for the amount of bytes to copy - this - will ensure we wont exceed the information provided by - the kernel, regardless whenever there is a trailing \0 - or not. This also helps with unnamed sockets. - - Note the case of abstract socket, the sun_path is actually - a blob and can contain \0 characters, - it should not be - passed to g_strndup and the like, it should be accessed by - memcpy-like functions. - - Fixes: 4cfd970ec188558daa6214f26203fe553fb1e01f - Fixes: http://bugs.debian.org/993145 - Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> - Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> - Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> - CC: qemu-stable@nongnu.org - -diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c -index f2f3676d1f..c5043999e9 100644 ---- a/util/qemu-sockets.c -+++ b/util/qemu-sockets.c -@@ -1345,25 +1345,22 @@ socket_sockaddr_to_address_unix(struct sockaddr_storage *sa, - SocketAddress *addr; - struct sockaddr_un *su = (struct sockaddr_un *)sa; - -- assert(salen >= sizeof(su->sun_family) + 1 && -- salen <= sizeof(struct sockaddr_un)); -- - addr = g_new0(SocketAddress, 1); - addr->type = SOCKET_ADDRESS_TYPE_UNIX; -+ salen -= offsetof(struct sockaddr_un, sun_path); - #ifdef CONFIG_LINUX -- if (!su->sun_path[0]) { -+ if (salen > 0 && !su->sun_path[0]) { - /* Linux abstract socket */ -- addr->u.q_unix.path = g_strndup(su->sun_path + 1, -- salen - sizeof(su->sun_family) - 1); -+ addr->u.q_unix.path = g_strndup(su->sun_path + 1, salen - 1); - addr->u.q_unix.has_abstract = true; - addr->u.q_unix.abstract = true; - addr->u.q_unix.has_tight = true; -- addr->u.q_unix.tight = salen < sizeof(*su); -+ addr->u.q_unix.tight = salen < sizeof(su->sun_path); - return addr; - } - #endif - -- addr->u.q_unix.path = g_strndup(su->sun_path, sizeof(su->sun_path)); -+ addr->u.q_unix.path = g_strndup(su->sun_path, salen); - return addr; - } - #endif /* WIN32 */ diff --git a/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch new file mode 100644 index 000000000000..af220802069c --- /dev/null +++ b/app-emulation/qemu/files/qemu-6.2.0-also-build-virtfs-proxy-helper.patch @@ -0,0 +1,34 @@ +From 42e53a0aadb76dfa7c11cd3b14eb4a41efba9bbe Mon Sep 17 00:00:00 2001 +From: Matthias Maier <tamiko@43-1.org> +Date: Tue, 11 Jan 2022 07:20:31 -0600 +Subject: [PATCH] also build virtfs-proxy-helper + +The Gentoo ebuild splits the qemu build into a softmmu, user and tool +phase in order to be able to build and link some of the qemu emulators +statically. This unfortunately has the consequence that we never +configure with "have_virtfs" and "have_tools" at the same time. + +As a workaround, simply build the virtfs userland unconditionally. After +all, it is a tiny executable +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index fbe856700..d6918b04c 100644 +--- a/meson.build ++++ b/meson.build +@@ -1390,7 +1390,7 @@ have_virtfs = (targetos == 'linux' and + libattr.found() and + libcap_ng.found()) + +-have_virtfs_proxy_helper = have_virtfs and have_tools ++have_virtfs_proxy_helper = have_tools and libcap_ng.found() + + + + if get_option('virtfs').enabled() + if not have_virtfs +-- +2.34.1 + diff --git a/app-emulation/qemu/qemu-6.1.0-r3.ebuild b/app-emulation/qemu/qemu-6.1.0-r3.ebuild deleted file mode 100644 index 32c26eaa3055..000000000000 --- a/app-emulation/qemu/qemu-6.1.0-r3.ebuild +++ /dev/null @@ -1,909 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PYTHON_COMPAT=( python3_{7,8,9,10} ) -PYTHON_REQ_USE="ncurses,readline" - -FIRMWARE_ABI_VERSION="6.1.0" - -inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ - pax-utils xdg-utils - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" - EGIT_SUBMODULES=( - meson - tests/fp/berkeley-softfloat-3 - tests/fp/berkeley-testfloat-3 - ui/keycodemapdb - ) - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="amd64 arm64 ~ppc ppc64 x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc - +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg - lzo multipath - ncurses nfs nls numa opengl +oss +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static static-user systemtap test udev usb - 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 - rx - tricore -" -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}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - sdl-image? ( sdl ) - static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) - static-user? ( !plugins ) - vhost-user-fs? ( caps seccomp ) - virgl? ( opengl ) - virtfs? ( caps xattr ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static !static-user ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - dev-libs/libxml2[static-libs(+)] - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( - sys-fabric/libibumad:=[static-libs(+)] - sys-fabric/libibverbs:=[static-libs(+)] - sys-fabric/librdmacm:=[static-libs(+)] - ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) - udev? ( virtual/libudev:= ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202105" -SEABIOS_VERSION="1.14.0" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[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-${EDK2_OVMF_VERSION} - sys-firmware/ipxe[qemu] - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - sys-firmware/sgabios - )" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - ) -" - -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - ) -" -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_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 ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} )" -RDEPEND="${CDEPEND} - acct-group/kvm - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-6.1.0-strings.patch - "${FILESDIR}"/${P}-fix-unix-socket-copy.patch - "${FILESDIR}"/${P}-automagic-libbpf.patch - "${FILESDIR}"/${P}-data-corruption.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a <USER> kvm -then have <USER> re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Verbose builds - MAKEOPTS+=" V=1" - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable doc docs) - $(use_enable nls gettext) - $(use_enable plugins) - $(use_enable xattr attr) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_notuser jemalloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp slirp system) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser vhost-user-fs) - $(conf_tools vhost-user-fs virtiofsd) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ${buildtype} == "user" ]] ; then - conf_opts+=( --disable-libxml2 ) - else - conf_opts+=( --enable-libxml2 ) - fi - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(printf "%s," "${audio_opts[@]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <<EOF >>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # 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 - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - 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 " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-emulation/qemu/qemu-6.2.0-r1.ebuild b/app-emulation/qemu/qemu-6.2.0-r1.ebuild deleted file mode 100644 index 0db52dfb3320..000000000000 --- a/app-emulation/qemu/qemu-6.2.0-r1.ebuild +++ /dev/null @@ -1,917 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8,9,10} ) -PYTHON_REQ_USE="ncurses,readline" - -FIRMWARE_ABI_VERSION="6.2.0" - -inherit linux-info toolchain-funcs python-r1 udev fcaps readme.gentoo-r1 \ - pax-utils xdg-utils - -if [[ ${PV} = *9999* ]]; then - EGIT_REPO_URI="https://git.qemu.org/git/qemu.git" - EGIT_SUBMODULES=( - meson - tests/fp/berkeley-softfloat-3 - tests/fp/berkeley-testfloat-3 - ui/keycodemapdb - ) - inherit git-r3 - SRC_URI="" -else - SRC_URI="https://download.qemu.org/${P}.tar.xz" - KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" -HOMEPAGE="https://www.qemu.org https://www.linux-kvm.org" - -LICENSE="GPL-2 LGPL-2 BSD-2" -SLOT="0" - -IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug +doc - +fdt fuse glusterfs gnutls gtk infiniband iscsi io-uring - jack jemalloc +jpeg - lzo multipath - ncurses nfs nls numa opengl +oss pam +pin-upstream-blobs - plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux - +slirp - smartcard snappy spice ssh static static-user systemtap test udev usb - 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 - rx - tricore -" -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}) -IUSE+=" ${use_softmmu_targets} ${use_user_targets}" - -RESTRICT="!test? ( test )" -# Allow no targets to be built so that people can get a tools-only build. -# Block USE flag configurations known to not work. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - qemu_softmmu_targets_arm? ( fdt ) - qemu_softmmu_targets_microblaze? ( fdt ) - qemu_softmmu_targets_mips64el? ( fdt ) - qemu_softmmu_targets_ppc64? ( fdt ) - qemu_softmmu_targets_ppc? ( fdt ) - qemu_softmmu_targets_riscv32? ( fdt ) - qemu_softmmu_targets_riscv64? ( fdt ) - qemu_softmmu_targets_x86_64? ( fdt ) - sdl-image? ( sdl ) - static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy !udev ) - static-user? ( !plugins ) - vhost-user-fs? ( caps seccomp ) - virgl? ( opengl ) - virtfs? ( caps xattr ) - vte? ( gtk ) - multipath? ( udev ) - plugins? ( !static !static-user ) -" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# and user/softmmu targets (qemu-*, qemu-system-*). -# -# Yep, you need both libcap and libcap-ng since virtfs only uses libcap. -# -# The attr lib isn't always linked in (although the USE flag is always -# respected). This is because qemu supports using the C library's API -# when available rather than always using the external library. -ALL_DEPEND=" - >=dev-libs/glib-2.0[static-libs(+)] - sys-libs/zlib[static-libs(+)] - python? ( ${PYTHON_DEPS} ) - systemtap? ( dev-util/systemtap ) - xattr? ( sys-apps/attr[static-libs(+)] )" - -# Dependencies required for qemu tools (qemu-nbd, qemu-img, qemu-io, ...) -# softmmu targets (qemu-system-*). -SOFTMMU_TOOLS_DEPEND=" - dev-libs/libxml2[static-libs(+)] - >=x11-libs/pixman-0.28.0[static-libs(+)] - accessibility? ( - app-accessibility/brltty[api] - app-accessibility/brltty[static-libs(+)] - ) - aio? ( dev-libs/libaio[static-libs(+)] ) - alsa? ( >=media-libs/alsa-lib-1.0.13 ) - bpf? ( dev-libs/libbpf:= ) - bzip2? ( app-arch/bzip2[static-libs(+)] ) - capstone? ( dev-libs/capstone:= ) - caps? ( sys-libs/libcap-ng[static-libs(+)] ) - curl? ( >=net-misc/curl-7.15.4[static-libs(+)] ) - fdt? ( >=sys-apps/dtc-1.5.0[static-libs(+)] ) - fuse? ( >=sys-fs/fuse-3.1:3[static-libs(+)] ) - glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] ) - gnutls? ( - dev-libs/nettle:=[static-libs(+)] - >=net-libs/gnutls-3.0:=[static-libs(+)] - ) - gtk? ( - x11-libs/gtk+:3 - vte? ( x11-libs/vte:2.91 ) - ) - infiniband? ( sys-cluster/rdma-core[static-libs(+)] ) - iscsi? ( net-libs/libiscsi ) - io-uring? ( sys-libs/liburing:=[static-libs(+)] ) - jack? ( virtual/jack ) - jemalloc? ( dev-libs/jemalloc ) - jpeg? ( virtual/jpeg:0=[static-libs(+)] ) - lzo? ( dev-libs/lzo:2[static-libs(+)] ) - multipath? ( sys-fs/multipath-tools ) - ncurses? ( - sys-libs/ncurses:=[unicode(+)] - sys-libs/ncurses:=[static-libs(+)] - ) - nfs? ( >=net-fs/libnfs-1.9.3:=[static-libs(+)] ) - numa? ( sys-process/numactl[static-libs(+)] ) - opengl? ( - virtual/opengl - media-libs/libepoxy[static-libs(+)] - media-libs/mesa[static-libs(+)] - media-libs/mesa[egl(+),gbm(+)] - ) - pam? ( sys-libs/pam ) - png? ( media-libs/libpng:0=[static-libs(+)] ) - pulseaudio? ( media-sound/pulseaudio ) - rbd? ( sys-cluster/ceph ) - sasl? ( dev-libs/cyrus-sasl[static-libs(+)] ) - sdl? ( - media-libs/libsdl2[video] - media-libs/libsdl2[static-libs(+)] - ) - sdl-image? ( media-libs/sdl2-image[static-libs(+)] ) - seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] ) - slirp? ( net-libs/libslirp[static-libs(+)] ) - smartcard? ( >=app-emulation/libcacard-2.5.0[static-libs(+)] ) - snappy? ( app-arch/snappy:= ) - spice? ( - >=app-emulation/spice-protocol-0.12.3 - >=app-emulation/spice-0.12.0[static-libs(+)] - ) - ssh? ( >=net-libs/libssh-0.8.6[static-libs(+)] ) - udev? ( virtual/libudev:= ) - usb? ( >=virtual/libusb-1-r2[static-libs(+)] ) - usbredir? ( >=sys-apps/usbredir-0.6[static-libs(+)] ) - vde? ( net-misc/vde[static-libs(+)] ) - virgl? ( media-libs/virglrenderer[static-libs(+)] ) - virtfs? ( sys-libs/libcap ) - xen? ( app-emulation/xen-tools:= ) - xfs? ( sys-fs/xfsprogs[static-libs(+)] ) - zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) -" - -EDK2_OVMF_VERSION="202105" -SEABIOS_VERSION="1.14.0" - -X86_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/edk2-ovmf-${EDK2_OVMF_VERSION}[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-${EDK2_OVMF_VERSION} - sys-firmware/ipxe[qemu] - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - sys-firmware/sgabios - )" -PPC_FIRMWARE_DEPEND=" - pin-upstream-blobs? ( - ~sys-firmware/seabios-${SEABIOS_VERSION}[binary,seavgabios] - ) - !pin-upstream-blobs? ( - >=sys-firmware/seabios-${SEABIOS_VERSION}[seavgabios] - ) -" - -BDEPEND=" - $(python_gen_impl_dep) - dev-lang/perl - sys-apps/texinfo - virtual/pkgconfig - doc? ( - dev-python/sphinx[${PYTHON_USEDEP}] - dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}] - ) - gtk? ( nls? ( sys-devel/gettext ) ) - test? ( - dev-libs/glib[utils] - sys-devel/bc - ) -" -CDEPEND=" - !static? ( - ${ALL_DEPEND//\[static-libs(+)]} - ${SOFTMMU_TOOLS_DEPEND//\[static-libs(+)]} - ) - qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} ) - qemu_softmmu_targets_x86_64? ( ${X86_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 ) - static? ( - ${ALL_DEPEND} - ${SOFTMMU_TOOLS_DEPEND} - ) - static-user? ( ${ALL_DEPEND} )" -RDEPEND="${CDEPEND} - acct-group/kvm - selinux? ( sec-policy/selinux-qemu )" - -PATCHES=( - "${FILESDIR}"/${PN}-2.11.1-capstone_include_path.patch - "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch - "${FILESDIR}"/${PN}-6.0.0-make.patch - "${FILESDIR}"/${PN}-6.1.0-strings.patch - "${FILESDIR}"/${PN}-6.2.0-user-SLIC-crash.patch -) - -QA_PREBUILT=" - usr/share/qemu/hppa-firmware.img - usr/share/qemu/openbios-ppc - usr/share/qemu/openbios-sparc64 - usr/share/qemu/openbios-sparc32 - usr/share/qemu/opensbi-riscv64-generic-fw_dynamic.elf - usr/share/qemu/opensbi-riscv32-generic-fw_dynamic.elf - usr/share/qemu/palcode-clipper - usr/share/qemu/s390-ccw.img - usr/share/qemu/s390-netboot.img - usr/share/qemu/u-boot.e500 -" - -QA_WX_LOAD="usr/bin/qemu-i386 - usr/bin/qemu-x86_64 - usr/bin/qemu-alpha - usr/bin/qemu-arm - usr/bin/qemu-cris - usr/bin/qemu-m68k - usr/bin/qemu-microblaze - usr/bin/qemu-microblazeel - usr/bin/qemu-mips - usr/bin/qemu-mipsel - usr/bin/qemu-or1k - usr/bin/qemu-ppc - usr/bin/qemu-ppc64 - usr/bin/qemu-ppc64abi32 - usr/bin/qemu-sh4 - usr/bin/qemu-sh4eb - usr/bin/qemu-sparc - usr/bin/qemu-sparc64 - usr/bin/qemu-armeb - usr/bin/qemu-sparc32plus - usr/bin/qemu-s390x - usr/bin/qemu-unicore32 -" - -DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure you have the -kernel module loaded before running kvm. The easiest way to ensure that the -kernel module is loaded is to load it on boot. - For AMD CPUs the module is called 'kvm-amd'. - For Intel CPUs the module is called 'kvm-intel'. -Please review /etc/conf.d/modules for how to load these. - -Make sure your user is in the 'kvm' group. Just run - $ gpasswd -a <USER> kvm -then have <USER> re-login. - -For brand new installs, the default permissions on /dev/kvm might not let -you access it. You can tell udev to reset ownership/perms: - $ udevadm trigger -c add /dev/kvm - -If you want to register binfmt handlers for qemu user targets: -For openrc: - # rc-update add qemu-binfmt -For systemd: - # ln -s /usr/share/qemu/binfmt.d/qemu.conf /etc/binfmt.d/qemu.conf" - -pkg_pretend() { - if use kernel_linux && kernel_is lt 2 6 25; then - eerror "This version of KVM requires a host kernel of 2.6.25 or higher." - elif use kernel_linux; then - if ! linux_config_exists; then - eerror "Unable to check your kernel for KVM support" - else - CONFIG_CHECK="~KVM ~TUN ~BRIDGE" - ERROR_KVM="You must enable KVM in your kernel to continue" - ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in" - ERROR_KVM_AMD+=" your kernel configuration." - ERROR_KVM_INTEL="If you have an Intel CPU, you must enable" - ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration." - ERROR_TUN="You will need the Universal TUN/TAP driver compiled" - ERROR_TUN+=" into your kernel or loaded as a module to use the" - ERROR_TUN+=" virtual network device if using -net tap." - ERROR_BRIDGE="You will also need support for 802.1d" - ERROR_BRIDGE+=" Ethernet Bridging for some network configurations." - use vhost-net && CONFIG_CHECK+=" ~VHOST_NET" - ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net" - ERROR_VHOST_NET+=" support" - - if use amd64 || use x86 || use amd64-linux || use x86-linux; then - if grep -q AuthenticAMD /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_AMD" - elif grep -q GenuineIntel /proc/cpuinfo; then - CONFIG_CHECK+=" ~KVM_INTEL" - fi - fi - - use python && CONFIG_CHECK+=" ~DEBUG_FS" - ERROR_DEBUG_FS="debugFS support required for kvm_stat" - - # Now do the actual checks setup above - check_extra_config - fi - fi - - if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then - eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt" - eerror "instances are still pointing to it. Please update your" - eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag" - eerror "and the right system binary (e.g. qemu-system-x86_64)." - die "update your virt configs to not use qemu-kvm" - fi -} - -# Sanity check to make sure target lists are kept up-to-date. -check_targets() { - local var=$1 mak=$2 - local detected sorted - - pushd "${S}"/configs/targets/ >/dev/null || die - - # Force C locale until glibc is updated. #564936 - detected=$(echo $(printf '%s\n' *-${mak}.mak | sed "s:-${mak}.mak::" | LC_COLLATE=C sort -u)) - sorted=$(echo $(printf '%s\n' ${!var} | LC_COLLATE=C sort -u)) - if [[ ${sorted} != "${detected}" ]] ; then - eerror "The ebuild needs to be kept in sync." - eerror "${var}: ${sorted}" - eerror "$(printf '%-*s' ${#var} configure): ${detected}" - die "sync ${var} to the list of targets" - fi - - popd >/dev/null -} - -src_prepare() { - check_targets IUSE_SOFTMMU_TARGETS softmmu - check_targets IUSE_USER_TARGETS linux-user - - default - - # Use correct toolchain to fix cross-compiling - tc-export AR AS LD NM OBJCOPY PKG_CONFIG RANLIB STRINGS - export WINDRES=${CHOST}-windres - - # Verbose builds - MAKEOPTS+=" V=1" - - # Remove bundled copy of libfdt - rm -r dtc || die -} - -## -# configures qemu based on the build directory and the build type -# we are using. -# -qemu_src_configure() { - debug-print-function ${FUNCNAME} "$@" - - local buildtype=$1 - local builddir="${S}/${buildtype}-build" - - mkdir "${builddir}" - - local conf_opts=( - --prefix=/usr - --sysconfdir=/etc - --bindir=/usr/bin - --libdir=/usr/$(get_libdir) - --datadir=/usr/share - --docdir=/usr/share/doc/${PF}/html - --mandir=/usr/share/man - --localstatedir=/var - --disable-bsd-user - --disable-containers # bug #732972 - --disable-guest-agent - --disable-strip - - # bug #746752: TCG interpreter has a few limitations: - # - it does not support FPU - # - it's generally slower on non-self-modifying code - # It's advantage is support for host architectures - # where native codegeneration is not implemented. - # Gentoo has qemu keyworded only on targets with - # native code generation available. Avoid the interpreter. - --disable-tcg-interpreter - - --disable-werror - # We support gnutls/nettle for crypto operations. It is possible - # to use gcrypt when gnutls/nettle are disabled (but not when they - # are enabled), but it's not really worth the hassle. Disable it - # all the time to avoid automatically detecting it. #568856 - --disable-gcrypt - --python="${PYTHON}" - --cc="$(tc-getCC)" - --cxx="$(tc-getCXX)" - --host-cc="$(tc-getBUILD_CC)" - $(use_enable debug debug-info) - $(use_enable debug debug-tcg) - $(use_enable doc docs) - $(use_enable nls gettext) - $(use_enable pam auth-pam) - $(use_enable plugins) - $(use_enable xattr attr) - $(use_enable alsa) - $(use_enable jack) - $(use_enable oss) - $(use_enable pulseaudio pa) - ) - - # Disable options not used by user targets. This simplifies building - # static user targets (USE=static-user) considerably. - conf_notuser() { - if [[ ${buildtype} == "user" ]] ; then - echo "--disable-${2:-$1}" - else - use_enable "$@" - fi - } - # Enable option only for softmmu build, but not 'user' or 'tools' - conf_softmmu() { - if [[ ${buildtype} == "softmmu" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Enable option only for tools build, but not 'user' or 'softmmu' - conf_tools() { - if [[ ${buildtype} == "tools" ]] ; then - use_enable "$@" - else - echo "--disable-${2:-$1}" - fi - } - # Special case for the malloc flag, because the --disable flag does - # not exist and trying like above will break configuring. - conf_malloc() { - if [[ ! ${buildtype} == "user" ]] ; then - usex "${1}" "--enable-malloc=${1}" "" - fi - } - conf_opts+=( - $(conf_notuser accessibility brlapi) - $(conf_notuser aio linux-aio) - $(conf_softmmu bpf) - $(conf_notuser bzip2) - $(conf_notuser capstone) - $(conf_notuser caps cap-ng) - $(conf_notuser curl) - $(conf_notuser fdt) - $(conf_notuser fuse) - $(conf_notuser glusterfs) - $(conf_notuser gnutls) - $(conf_notuser gnutls nettle) - $(conf_notuser gtk) - $(conf_notuser infiniband rdma) - $(conf_notuser iscsi libiscsi) - $(conf_notuser io-uring linux-io-uring) - $(conf_malloc jemalloc) - $(conf_notuser jpeg vnc-jpeg) - $(conf_notuser kernel_linux kvm) - $(conf_notuser lzo) - $(conf_notuser multipath mpath) - $(conf_notuser ncurses curses) - $(conf_notuser nfs libnfs) - $(conf_notuser numa) - $(conf_notuser opengl) - $(conf_notuser png vnc-png) - $(conf_notuser rbd) - $(conf_notuser sasl vnc-sasl) - $(conf_notuser sdl) - $(conf_softmmu sdl-image) - $(conf_notuser seccomp) - $(conf_notuser slirp slirp system) - $(conf_notuser smartcard) - $(conf_notuser snappy) - $(conf_notuser spice) - $(conf_notuser ssh libssh) - $(conf_notuser udev libudev) - $(conf_notuser usb libusb) - $(conf_notuser usbredir usb-redir) - $(conf_notuser vde) - $(conf_notuser vhost-net) - $(conf_notuser vhost-user-fs) - $(conf_tools vhost-user-fs virtiofsd) - $(conf_notuser virgl virglrenderer) - $(conf_softmmu virtfs) - $(conf_notuser vnc) - $(conf_notuser vte) - $(conf_notuser xen) - $(conf_notuser xen xen-pci-passthrough) - $(conf_notuser xfs xfsctl) - # use prebuilt keymaps, bug #759604 - --disable-xkbcommon - $(conf_notuser zstd) - ) - - if [[ ${buildtype} == "user" ]] ; then - conf_opts+=( --disable-libxml2 ) - else - conf_opts+=( --enable-libxml2 ) - fi - - if [[ ! ${buildtype} == "user" ]] ; then - # audio options - local audio_opts=( - # Note: backend order matters here: #716202 - # We iterate from higher-level to lower level. - $(usex pulseaudio pa "") - $(usev jack) - $(usev sdl) - $(usev alsa) - $(usev oss) - ) - conf_opts+=( - --audio-drv-list=$(IFS=,; echo "${audio_opts[*]}") - ) - fi - - case ${buildtype} in - user) - conf_opts+=( - --enable-linux-user - --disable-system - --disable-blobs - --disable-tools - ) - local static_flag="static-user" - ;; - softmmu) - conf_opts+=( - --disable-linux-user - --enable-system - --disable-tools - ) - local static_flag="static" - ;; - tools) - conf_opts+=( - --disable-linux-user - --disable-system - --disable-blobs - --enable-tools - ) - local static_flag="static" - ;; - esac - - local targets="${buildtype}_targets" - [[ -n ${targets} ]] && conf_opts+=( --target-list="${!targets}" ) - - # Add support for SystemTAP - use systemtap && conf_opts+=( --enable-trace-backend=dtrace ) - - # We always want to attempt to build with PIE support as it results - # in a more secure binary. But it doesn't work with static or if - # the current GCC doesn't have PIE support. - if use ${static_flag}; then - conf_opts+=( --static --disable-pie ) - else - tc-enables-pie && conf_opts+=( --enable-pie ) - fi - - # Meson will not use a cross-file unless cross_prefix is set. - tc-is-cross-compiler && conf_opts+=( --cross-prefix="${CHOST}-" ) - - # Plumb through equivalent of EXTRA_ECONF to allow experiments - # like bug #747928. - conf_opts+=( ${EXTRA_CONF_QEMU} ) - - echo "../configure ${conf_opts[*]}" - cd "${builddir}" - ../configure "${conf_opts[@]}" || die "configure failed" -} - -src_configure() { - local target - - python_setup - - softmmu_targets= softmmu_bins=() - user_targets= user_bins=() - - for target in ${IUSE_SOFTMMU_TARGETS} ; do - if use "qemu_softmmu_targets_${target}"; then - softmmu_targets+=",${target}-softmmu" - softmmu_bins+=( "qemu-system-${target}" ) - fi - done - - for target in ${IUSE_USER_TARGETS} ; do - if use "qemu_user_targets_${target}"; then - user_targets+=",${target}-linux-user" - user_bins+=( "qemu-${target}" ) - fi - done - - softmmu_targets=${softmmu_targets#,} - user_targets=${user_targets#,} - - [[ -n ${softmmu_targets} ]] && qemu_src_configure "softmmu" - [[ -n ${user_targets} ]] && qemu_src_configure "user" - qemu_src_configure "tools" -} - -src_compile() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - default - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - default - fi - - cd "${S}/tools-build" - default -} - -src_test() { - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - pax-mark m */qemu-system-* #515550 - emake check - fi -} - -qemu_python_install() { - python_domodule "${S}/python/qemu" - - python_doscript "${S}/scripts/kvm/vmxcap" - python_doscript "${S}/scripts/qmp/qmp-shell" - python_doscript "${S}/scripts/qmp/qemu-ga-client" -} - -# Generate binfmt support files. -# - /etc/init.d/qemu-binfmt script which registers the user handlers (openrc) -# - /usr/share/qemu/binfmt.d/qemu.conf (for use with systemd-binfmt) -generate_initd() { - local out="${T}/qemu-binfmt" - local out_systemd="${T}/qemu.conf" - local d="${T}/binfmt.d" - - einfo "Generating qemu binfmt scripts and configuration files" - - # Generate the debian fragments first. - mkdir -p "${d}" - "${S}"/scripts/qemu-binfmt-conf.sh \ - --debian \ - --exportdir "${d}" \ - --qemu-path "${EPREFIX}/usr/bin" \ - || die - # Then turn the fragments into a shell script we can source. - sed -E -i \ - -e 's:^([^ ]+) (.*)$:\1="\2":' \ - "${d}"/* || die - - # Generate the init.d script by assembling the fragments from above. - local f qcpu package interpreter magic mask - cat "${FILESDIR}"/qemu-binfmt.initd.head >"${out}" || die - for f in "${d}"/qemu-* ; do - source "${f}" - - # Normalize the cpu logic like we do in the init.d for the native cpu. - qcpu=${package#qemu-} - case ${qcpu} in - arm*) qcpu="arm";; - mips*) qcpu="mips";; - ppc*) qcpu="ppc";; - s390*) qcpu="s390";; - sh*) qcpu="sh";; - sparc*) qcpu="sparc";; - esac - - # we use 'printf' here to be portable across 'sh' - # implementations: #679168 - cat <<EOF >>"${out}" - if [ "\${cpu}" != "${qcpu}" -a -x "${interpreter}" ] ; then - printf '%s\n' ':${package}:M::${magic}:${mask}:${interpreter}:'"\${QEMU_BINFMT_FLAGS}" >/proc/sys/fs/binfmt_misc/register - fi -EOF - - echo ":${package}:M::${magic}:${mask}:${interpreter}:OC" >>"${out_systemd}" - - done - cat "${FILESDIR}"/qemu-binfmt.initd.tail >>"${out}" || die -} - -src_install() { - if [[ -n ${user_targets} ]]; then - cd "${S}/user-build" - emake DESTDIR="${ED}" install - - # Install binfmt handler init script for user targets. - generate_initd - doinitd "${T}/qemu-binfmt" - - # Install binfmt/qemu.conf. - insinto "/usr/share/qemu/binfmt.d" - doins "${T}/qemu.conf" - fi - - if [[ -n ${softmmu_targets} ]]; then - cd "${S}/softmmu-build" - emake DESTDIR="${ED}" install - - # This might not exist if the test failed. #512010 - [[ -e check-report.html ]] && dodoc check-report.html - - if use kernel_linux; then - udev_newrules "${FILESDIR}"/65-kvm.rules-r2 65-kvm.rules - fi - - if use python; then - python_foreach_impl qemu_python_install - fi - fi - - cd "${S}/tools-build" - emake DESTDIR="${ED}" install - - # Disable mprotect on the qemu binaries as they use JITs to be fast #459348 - pushd "${ED}"/usr/bin >/dev/null - pax-mark mr "${softmmu_bins[@]}" "${user_bins[@]}" # bug 575594 - popd >/dev/null - - # Install config file example for qemu-bridge-helper - insinto "/etc/qemu" - doins "${FILESDIR}/bridge.conf" - - cd "${S}" - dodoc MAINTAINERS docs/specs/pci-ids.txt - newdoc pc-bios/README README.pc-bios - - # Disallow stripping of prebuilt firmware files. - dostrip -x ${QA_PREBUILT} - - if [[ -n ${softmmu_targets} ]]; then - # Remove SeaBIOS since we're using the SeaBIOS packaged one - rm "${ED}/usr/share/qemu/bios.bin" - rm "${ED}/usr/share/qemu/bios-256k.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../seabios/bios.bin /usr/share/qemu/bios.bin - dosym ../seabios/bios-256k.bin /usr/share/qemu/bios-256k.bin - fi - - # Remove vgabios since we're using the seavgabios packaged one - rm "${ED}/usr/share/qemu/vgabios.bin" - rm "${ED}/usr/share/qemu/vgabios-cirrus.bin" - rm "${ED}/usr/share/qemu/vgabios-qxl.bin" - rm "${ED}/usr/share/qemu/vgabios-stdvga.bin" - rm "${ED}/usr/share/qemu/vgabios-virtio.bin" - rm "${ED}/usr/share/qemu/vgabios-vmware.bin" - # 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 - dosym ../seavgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin - dosym ../seavgabios/vgabios-virtio.bin /usr/share/qemu/vgabios-virtio.bin - dosym ../seavgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin - fi - - # Remove sgabios since we're using the sgabios packaged one - rm "${ED}/usr/share/qemu/sgabios.bin" - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin - fi - - # Remove iPXE since we're using the iPXE packaged one - rm "${ED}"/usr/share/qemu/pxe-*.rom - if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then - dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom - dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom - dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom - dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom - dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom - dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom - fi - fi - - DISABLE_AUTOFORMATTING=true - readme.gentoo_create_doc -} - -firmware_abi_change() { - local pv - for pv in ${REPLACING_VERSIONS}; do - if ver_test ${pv} -lt ${FIRMWARE_ABI_VERSION}; then - return 0 - fi - done - return 1 -} - -pkg_postinst() { - if [[ -n ${softmmu_targets} ]] && use kernel_linux; then - udev_reload - fi - - xdg_icon_cache_update - - [[ -z ${EPREFIX} ]] && [[ -f ${EROOT}/usr/libexec/qemu-bridge-helper ]] && \ - fcaps cap_net_admin ${EROOT}/usr/libexec/qemu-bridge-helper - - DISABLE_AUTOFORMATTING=true - readme.gentoo_print_elog - - if use pin-upstream-blobs && firmware_abi_change; then - ewarn "This version of qemu pins new versions of firmware blobs:" - ewarn " $(best_version sys-firmware/edk2-ovmf)" - ewarn " $(best_version sys-firmware/ipxe)" - ewarn " $(best_version sys-firmware/seabios)" - ewarn " $(best_version sys-firmware/sgabios)" - 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 " app-emulation/qemu-${FIRMWARE_ABI_VERSION}." - fi -} - -pkg_info() { - echo "Using:" - echo " $(best_version app-emulation/spice-protocol)" - echo " $(best_version sys-firmware/edk2-ovmf)" - if has_version 'sys-firmware/edk2-ovmf[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/ipxe)" - echo " $(best_version sys-firmware/seabios)" - if has_version 'sys-firmware/seabios[binary]'; then - echo " USE=binary" - else - echo " USE=''" - fi - echo " $(best_version sys-firmware/sgabios)" -} - -pkg_postrm() { - xdg_icon_cache_update -} diff --git a/app-emulation/qemu/qemu-6.2.0-r2.ebuild b/app-emulation/qemu/qemu-6.2.0-r3.ebuild index 10b0bf44d7de..b7b5af92737a 100644 --- a/app-emulation/qemu/qemu-6.2.0-r2.ebuild +++ b/app-emulation/qemu/qemu-6.2.0-r3.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 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools" @@ -279,6 +279,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-6.1.0-strings.patch "${FILESDIR}"/${PN}-6.2.0-user-SLIC-crash.patch + "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT=" diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 7f3efa61e35b..d81060ed102b 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -278,6 +278,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-6.1.0-strings.patch + "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT=" diff --git a/app-emulation/ruffle/Manifest b/app-emulation/ruffle/Manifest index e58ba2742299..2c9ede9335b9 100644 --- a/app-emulation/ruffle/Manifest +++ b/app-emulation/ruffle/Manifest @@ -40,8 +40,8 @@ DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b DIST cfg_aliases-0.1.1.crate 6009 BLAKE2B 6acfae9a89d3479f7ce1f0b5dbb13bfe27c006b936a96685606a61a06f69d17ab754a8a0d96c54213f758281c2fb32ac74d03a34e0f836dc7e438387955aac37 SHA512 238828445c5b48ca41ff88825af0a1ad30494e423bb6f89b6d5e4d26042afaa1ceb0e32041f7cddd79c3e15c6c82a1ddb9469c4b63a1ac52d4bcc1174900f880 DIST chrono-0.4.19.crate 155663 BLAKE2B c92c273fb6475bbb2546dfb75eaa23321bc8f9a5fa8a7c652f527649b96ff8718fa932f52b500b02a4acae7837df5bdb14f69cb821d4962be2790dbd1d023a54 SHA512 a119349bfc2243a249f1d18b1ae548a04b30fecb75913a56f26d1ff8c0eb53097a2674d9141e2094018191cbbc1620843fbddaf52999824e077c1157f0907980 DIST clang-sys-1.3.0.crate 37713 BLAKE2B ca7ee0771a970ed67b02d55d9027bab061c52d624540894cd00d09d847f6f35c58e76a1a6153309f8af709474df64b46f4764c2036883a688ffb8154d77ed123 SHA512 80c78c53a877cd8208730885214c135dd65a208cfd047dba7595283bbeec266f4d39cd1e0b3c2c69a474569ba68e4db93636e31a77c350d7bb2337e06ee7cb74 -DIST clap-3.0.0-rc.7.crate 188935 BLAKE2B 68ee103dd6d46911c4c31a18833dabde085459ab7d22f2a5605af7c4359c254a6c4b37b508e26ea43620e3f2e645fc0fa6358da6aa93f43d46b930cad74705cc SHA512 b013466b88a549f5b7c7a9adb1d9981390bca4c3d1e18dc1554b8bbe69d3a8a57cc8a7bf5e21b0d306e982bde011ed7db633a8cc61458a79b5207808dd606338 -DIST clap_derive-3.0.0-rc.7.crate 24689 BLAKE2B e4cd871b7c212221af7b6afabd785545256be1de24d691b1443c876024dbb045d157c1b8de0aae6eaa01a7ca8b5f954ba45fa24f54c4daa54748b149a921da8e SHA512 a490f805510f2ee4761c32d37469f48cdbb367971469882bcb43f457051bc169f75784d8bab146fcc5397c2bf740574cf81aa97c756e7e35566170ad4a7faaf2 +DIST clap-3.0.1.crate 189189 BLAKE2B fb70451d86d02437b14f564a3ce302727b480b518bae78596adb2d3a74aa8ea0ea678116764d23c0041852f305359285d172163c25947a12641243e37711c9d8 SHA512 a3a745487ef73ddfa3554f3ddf4c9a5c54cde6beefc2c3e7ca9cf54b301b9eb1ebf20a5592a1018651c79c6844553cdab0f67ff9347e0f7e6facc48652f872af +DIST clap_derive-3.0.0.crate 24684 BLAKE2B dc56ba1b2d5dff063d19a1ed5d9188cd3cbb3fd65e11060b471cd842752d53a022b94f9acca0ad9c104d1b149667997433b7374991d3173c2ed87c372adb0bfd SHA512 4974f5df83fc27ffb132ad5247a3a368b8a3919f313d7e0477e3422640d1c6f19a30b11027ebedbab1a168e56a35e61474641741ec1dc75ca0ab3555a78d25fe DIST clipboard-0.5.0.crate 10009 BLAKE2B 17aaafeb92be0dfb4ccfdb80a3d909e57491cc0adceedf378196f7bbd006d245adfdd9b2d2e075c2c041aa57eb1a0e6e306032966c30e63f94d86b0f9f7a11ce SHA512 a02994e68bb4ecdb1ba3db05e095474e67df4d73f69c92ab096913f4bd0f47ec6b62c8f0210fd67bb466e293c765888c315770e447f5c6e9b2e5c69f71d3e48a DIST clipboard-win-2.2.0.crate 11079 BLAKE2B 5713e17a93eac4a1d299d42a6abe5db1eadbc90bf5e7c99e84b6b5febfc817bbc1c478533af8cbec7a8e58ebbc1a8f3d83bf351d105b55017cebab8048009390 SHA512 f869775bb2e6d84096034c26c888c9f671272232af74c02bda2a6c8f0d600652af581c0e94d875d8746b986314f61168bf7539042a65cb2ccbbf858141fa42e0 DIST cocoa-0.24.0.crate 39235 BLAKE2B 01078c3d96e88e0cac773f238d3d3144324594fd75cda87d18bc98d73f0a1acab4cd795471f4789d38b017e6cc90c0713bb33b0fdbdff36abcdc1cbae767da86 SHA512 accae0f676caa23c8d3fbc2e49365118a366c50a698ee9dce4ef194f1d391b3633cb789d65d5c2d1e43afdea5d7a82161f7e7042a9dab32747ecac29d1b1b20c @@ -147,7 +147,7 @@ DIST gpu-alloc-0.5.2.crate 17477 BLAKE2B 562601cc90eb3bff0a15aa0c2bc234a3806b323 DIST gpu-alloc-types-0.2.0.crate 3073 BLAKE2B 4010628ba21cab23dd8e23ebe38dafbf3ef072d686a67bdfc04ef3818d2341ea15bbec9be428ed638e57974c17db36614f9c9126faaeafeb4973fef0b8f95adb SHA512 37659361281d4e2a0785fbdf065c42d6e7922def36d225e1af78b392986647b904737f0f862c57ae0be28df24429ca999ac7a72b42d125a6f22564a92e80459e DIST gpu-descriptor-0.2.2.crate 5890 BLAKE2B 06b7466dadc43dcf27b82c913e10d4750e069fa8a02a7d98074bbf388ba33048157a11ba858fd966ec21d11ac690d6d99350552bd259771c029fb2df98b1f2b7 SHA512 6cd9a05181f0c7bf241ddbe1ab173eac3fa93cce1c56aa50e405b8fbe7467d12c71a2f8fafabb634d97c6f0cb71d25237617ee52c2510c09d78b5d1d52ad6e93 DIST gpu-descriptor-types-0.1.1.crate 1956 BLAKE2B 70789874373f3e98b5659b59a71dbbf71260f331c2811b759fab8db91f15aa4b484b9d0554aa54c80e4dbd4bc308ae7b636b4e1a59dd35d0a1428e1a8bf88711 SHA512 e313ccd74ac4a7c97bf0ec85ba65d84635d7aeaeedb8764496dd5ba332e4797f7305505babb5663b5413646a0c964bf1780c93942850a8930edc1d3b400ebcd2 -DIST h263-rs-03dcd486e88381635647a7386105cb802921b69c.tar.gz 82887 BLAKE2B d48468392793d5ff0bad9c186b27aba327757029d715c4822caaffc9226fda6ca7dd961e92b6a0f94cbfb66b8d89fa582e65a39bff04d99577c8a9f7fa8c6cfc SHA512 e71733373a79addc2a783313c80a0112e6be8bc98df572adf6edce0de7172ce1458ddbaa14e0d9f895f7c082ee37ebfbc30f20ab8efea6b4bc9679fd8743f826 +DIST h263-rs-b810e8c3fdb8ea5df0b7808891076e774bee40a9.tar.gz 83412 BLAKE2B 05e4a085084dad8ebc2343f909add41fba74b168b1b075efaaa76eedf44cd4ff5bc332a520418bfeb5c65d44b7f3aff2c99d7303c1b0e2139fc77d6a4c038ca8 SHA512 cedf5764255a3ff769bffc2902b3721d1e699efe4376d88dd3310b8a1cfeb2d41e7fbd1312aa8c79660d0342d428297eed6680186d411f3e2df1e4d163994a29 DIST hashbrown-0.11.2.crate 85713 BLAKE2B 402f9f1bdcb92631206f9b72923ee35e28db8623e87469c0f1496664bc7185077013ab3c8aea68268241e5b2504f10cddc613a350abd4291050deda6c112e559 SHA512 c21ca68fd49bbb741901f59fed04cc124b8da99e2a4dfc26e2e5e1140637872b344612a01691bd30cc771575c571be15f756c84dde225441699cd2322af2ad6c DIST heck-0.3.3.crate 10260 BLAKE2B dc756738081d855583f239908f671e9b5dde72ebfb577f6387b1a169817a03332464cf67071708a4c4f06b1ecb222118e8c719073ccdec1c0f938e5ef378b13f SHA512 b3498e033f44e03206421e565efec5b21d13107b60d35e4476331c44e6effd75c81f7678f2452c822eefd581209a2ffefd2034779cca2d8b4fac4583bbbf777f DIST hermit-abi-0.1.19.crate 9979 BLAKE2B 801e8052b85341cca388ada9db4b06bb1bd7b64474185b2ad06c0256b9e597639bd3dd4ba0053ea010f922e53969a4ab47b90d451fd9b94c8f2324055d151ea1 SHA512 1c877fcd562b15d2de9c151fd6c5f3ea4bf48abcb799e6139a180ffad5d64b632f0000d5707bbd92ff23a0e5f349157b9e0f5be8b50f03680b0fa47315dbb78a @@ -263,10 +263,10 @@ DIST proc-macro-crate-0.1.5.crate 8096 BLAKE2B 0a992f7aecf05335008731adc40e8ce6c DIST proc-macro-crate-1.1.0.crate 8535 BLAKE2B 73e4d8c7c19d122a74961ddcbd04b003418e61bbddac092e14e4f4a85bb5bc132289096b719f533b83310e1d2daae3e125dc63cb96cd33c8fbd8aacc781a0d45 SHA512 dd23638f127c46c24e7bc360a9f108ced8124acf8b0558b95021c40a59259f80c27a6ee6e366d72fc120908ae254c58feb7a73969457fce94fc1d20130ee590c DIST proc-macro-error-1.0.4.crate 25293 BLAKE2B ef918c5efaf2545ab38787c8d0c07315af00431139e4dff66346bf798e3a429f91d12a79776c150412fdda0b158a72badd5e1044ac4d6917f8482d4b5a7110b7 SHA512 8a47bc9d3e24e9561d1e384d8f5a633284c2cf9b5e6733c5f9d1dbfe1870ccc8e2152482852e50b551cecb68e009148585b910ffb0508a7b4875598eaf8657db DIST proc-macro-error-attr-1.0.4.crate 7971 BLAKE2B 98e2925881c2be186e22c2c439697e91d43f807eb61a5d13e3b0b4321ed50a74f3d699942c04b89b6fea0f156bb5d19ebcf22f9cd4b98a7e6917c437600ed823 SHA512 2606afa9ec78d7dad4500c98d3a5ecbd02c6b53ab829c742bed7f57b322a95238ab4e01cf268746815f1424fd9b02eddfa30e72f98c66106f57765f3d3116495 -DIST proc-macro2-1.0.32.crate 41003 BLAKE2B e8da70dae2ee75aa2c344602e55cbbf9ee5316ff6182c870b64f9fe4b33e60b9fb1a22137acf357615331f2e4079ab1e8964a2cb0234fa439d1b3d8d514c2eff SHA512 8631714c226c8a6fb330a529f42214216057eca85cfa63afd3de8600d2638e2be45efa54155ce73625883bcbabc2c56cb865ad9dda04e2c7092d955caed48abf +DIST proc-macro2-1.0.36.crate 41411 BLAKE2B d7d99aed41080b65680736d92dd027e21c9e9e0b03601915c000f5dea8f2b2d9126b116af32f2fb04b4fa407775f0131423055d0b62fdbfe87fa4ba7ec098beb SHA512 f31b0f2356af2746321c4f808ac9af87d21a5657c103ed6bc1383855e40caf49246cc8ec1edff58eacf193424abfc2163148b7298e527714e65e602f14b2e50a DIST profiling-1.0.4.crate 1687823 BLAKE2B 2663476c2e7ab1e444382f3141787fdce5191d442c67a914ab9d57ab4fce0a5d8d77454ec7964f74a7a297de19ebbb9fae892be25c0a6835ae833c92b9e300cd SHA512 b826fb49ee0520a2836399f6bceb79cde3a307fa7820339500109067e9bf8522ebad5f7b65726851149130af05436c0a465d63967bc5bda8fd2d2df5c9a1b5e3 DIST quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz 133091 BLAKE2B a6e703f72432fc29bce310307c933698e566ba93ae10048fcdac95abb93ef217002bed452dfcaa64a7ec86396f9eacb4e8650252618abfed0fcb0f11313d5ba7 SHA512 74b4f12120abfc29322faa185ac83f0a7a0cad7b9488978e1f9fcebc3930b0e2dec97dab8b87f9ccef1066908677f20b4a32978edc4bb9c39b3dcd7a92892436 -DIST quote-1.0.10.crate 29960 BLAKE2B fbd4e3e0e0f452e64b30399fdfaef318cead505d05f0c61db61a7aa3cd5a3300220b4ba2656603f88bc0b535390ab4d0ec101a919ace1d442a3e979f08e8d48f SHA512 08613679b564ea7d750117d3a2907ba957d5d595bdfa8016344f99a232c72c6b08acb882dff45c34c9e4c8f93f879fb308b36125572722aac04fbc6bb0c666f0 +DIST quote-1.0.14.crate 27252 BLAKE2B c744f787e311f9c42b2678f88978d68eaeae87324f07cb28042152a77244ff973e3bc93b8a277f590abe1b6b7c37f6b095ac4a75c96ef9590f7d9d397382b62f SHA512 b2879fa8ae5ca80fb8aba56da016d9b8aab0f1014cc67fe597f42999e8042b2178b98dcb09109edc74b6bd1dc542341a72d11e4880273ffaaf766da243e687e4 DIST radium-0.5.3.crate 7588 BLAKE2B ce39c4472bfa731745a0b78179e00b83116d729326d7a25dc629278949095ecc24a1eb13d4d39981e95536cad3f3fe2ac77ef9da27b8d462ed720bfc7624fbc5 SHA512 f4af86cddec991b11d86b1d976e212bb19da8d7e5ae1d40ee812391c21d3fc855bdb2770395baf7efcfdb5b2029a99c9038702a28f8c9e925e1b23f03c0e717a DIST rand-0.8.4.crate 87406 BLAKE2B c09358416d2425a8243b623346fe71bf6f03fddab1a23fc752f4303ba7c241b3606629e4edf0ea720785bda0bca534acd675c2de079b78eac3df24a1ad6ba654 SHA512 77ae0e988e31e12f7d3f2c40814f930eecbc94c4aced827c337be78eeeabf39fde2dc5c4fda059afdc01285ff4afe30393c32694377de004feff16207606558e DIST rand_chacha-0.3.1.crate 15251 BLAKE2B 645771b2c3e274f085e0837a20306b1d59f6e9032fba8eb38a6d1b30180d15e2f89ffa2a162bf6358da41e030098242d81e71dab4321980d0a4f6ddfc2974ce3 SHA512 8198c580b1b9b0429758ffa49cd8138fa3ce724f0dcf73c767ea7e55611d6a2e4c7cad9950896510def500ce4062b594386c947ac3d89425b4e5c9b04d0b8075 @@ -285,19 +285,20 @@ DIST regress-0.4.1.crate 99620 BLAKE2B 9141cad8f53e2a8e3ea3d746737ab5b8c75ed345f DIST renderdoc-sys-0.7.1.crate 4592 BLAKE2B d5c543119a498bf295bf506b164945a3de6c48358891170278baea05db0f67813d9bd232cc52593fa02095d04cbb163fdfc9ef2c121eb1155ca761b89350cc15 SHA512 5ef5596705e4d9b752e132571960e4518b96e47b65ea799dc4fc87cc4abcf769e05dafd3a7cf78df4957ed32d42f714f9d78b2f3614597cd5a45352a3f509dab DIST rle-decode-fast-1.0.1.crate 62490 BLAKE2B 34370186c8875c91b8d353b372518bc039c58061e0e0377c7596a9e100b047550e800c431f2b4a59556fc266eefcbc7846b53d5a4e10360fcbe435acf63249b2 SHA512 38b3565279b134dcb3bcba001b081ada73f36e4107bdee935036631b740b6e1d1f767e3965ad414e38c8606abc1733f898062bce01b8c19234f204adcbe05a4a DIST ron-0.6.6.crate 45107 BLAKE2B 96fde52fa2c073cce3a7d10ffea7d9156b71c3d801fe822be702a3d1cbcfab61d87024ab98dd2458fa05fdb7ffadd9eb0cae36ad87b02504e8585e1909bf4894 SHA512 06a2a1c4760bfd6c5b6743fbdb533cab6955e68ad6f60a47077d3ee359e2ed1b2d448eeae45af15e8b40f63076806fa7c56c1b803d3d339c4713a15f6b7a5040 -DIST ruffle-nightly-2021-12-22.tar.gz 7210584 BLAKE2B 2d8aada44368861619e1ade5bd525d891488c471da6ac23059ef687f883bcbeed56aae8e585686efc74afca3e3f9531732ee7b9b707ff5684faf0392a87e8e63 SHA512 5738cec4ca0050ebc69767549cbfce592568cb483f43dc9ef7a81c0bfd28dc4b319a631c0343914aa1b4a96e1111b4ac5c87f2431854c53fd9e2956caf1040e0 +DIST ruffle-nightly-2022-01-08.tar.gz 7210511 BLAKE2B eb74d9be32f7169adc59d26eec1d7fb5459563c2266a6362b5044b89964febcacda97c06fba289e9e3071e2d43c4f6424962d6fae20a9aed7e3df4bbbad269da SHA512 5938d12fd728f5f1eb39b4df7c4214a4f71307a6a34200d5d4ba08e1ec6c718636d4d2972cccfbeced3c20fee519b079b4aeaec44991fba1dc6e64d0187d67e4 DIST rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz 676612 BLAKE2B 3c2ff3edef1aad8e6276758fd3bac85106fa9a445180c9c7d954d5b4e469751b9a14e1cc8c3bc4736a410f5e1478eb821395b8f0a1acb0e5dca1082155b0690f SHA512 6f668066999d3454d255d227167ef92e8fcf5755017617439fc227d53c5b8169a7c585857bed4879991e8cab0a6efb4ee04eca3e1b7e01bfaaa4cab70af30d3a DIST rustc-hash-1.1.0.crate 9331 BLAKE2B 16ac56622897f47a06b661fb59a196b08d48e782ab87549c8bd5c6fe92f374c9bfd44dcb36588512bd9b6125c2fd79a12d648aaa308fd9694bcca3a7c1b49ac9 SHA512 84e673ea9b046f7b989d47f2c4505557fbd5de991e6fc9f56a03605d40e0b4ba5427cd566954890153cc033ccbec6c984306634571935bfe0d4cdfbe56f39544 DIST rustdct-0.6.0.crate 38905 BLAKE2B e55c9fc53b50865d434759600214ef14b0a4d06f224806d3f89f55b111848f4addb44419bad93cc5262e2eb8dc87dceb8b4920c63ce36b1cd227179e76b7a93d SHA512 87101defd1419596bf447e3acfe0dcc2f1667427117f148c01f755afc1898aecf0e38f7826687a5b9359da331820df633acd3fe0d0a0e87ff80e00c389c383b9 DIST rustfft-5.1.1.crate 220709 BLAKE2B 46657abbb6e82c76b5ead751266e8e4a4203a80047a20f5e67d20a3004374e3e08d6a027ba4e3b9a54aba6f5b290210a414b75905d9dc98895335f8bbd16f334 SHA512 3e0af0b343486fd73cc5e7b8d782e03e185b2505cc179c433a433e9a558fc4b3edd12538ad451d30b11469cd97a8aad70db6c9bb3698a37b41b684dcc4b3dd70 DIST ryu-1.0.6.crate 50032 BLAKE2B 13e805124f80de0d8175fe8b315b20b06f0ef188049e835843b91ffb90322bbfa54ddd0fe1617af851e8f5b59c1f076252b705394ed3408b5fb577059a46273f SHA512 175da99ee31a942800eb33ab5addcdf89b2bba95b6289be1560746d030acda547a5bc3e8cba714c252230a93bcd991b9593a7c94421222833bf089694ccf1655 +DIST safe_arch-0.6.0.crate 72016 BLAKE2B cf58644922728b0d20ccbd7045d95093013d250dcc7acee28e3f68efca40ecc5598dd5b27d38b8c0db1ecab4211a1f4dcbe4562f096eeb23227d7724219d45f0 SHA512 37af0aa16b671d3bda2b660979f6f047748b7d8b2f11458e45d8dc3127e15cd36e7d5b3afc686839130bfde39af1a0d17348fc3ba3da388f59c22e276d639d09 DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c DIST schannel-0.1.19.crate 42755 BLAKE2B 11503202bb6c8fdff3cc716558a5c00ca7497f7aaa4890d332084754e0d1e1013719d5bd744d8aa12b8b042401f4828fda8453c104d5feeb9b437d7cc51b5273 SHA512 319d9931cdeaa0f6b50c46e413fed2b6e97b28fe8c4825d4e5ed0fe22083e686e124117bfab7c89bcce815a31a3478f8c230cdedae6a852a31719a0df34645b0 DIST scoped-tls-1.0.0.crate 9146 BLAKE2B e6cecc543760a293b9ba4e71bf0d12f3360782795bc9d0f0bb054614a1c393f081b6178e98708b896037f5b8edcf371b727e7eb80f62bca24fe09a1903456729 SHA512 f09dd404bb45349ef444e7274a2aabfeaeda7c3c9f964bf5c52c39984c137f63bdf9fb3e33df8e312e52872f7721de25951a7f3b8333a670626c51afd36d314c DIST scoped_threadpool-0.1.9.crate 7800 BLAKE2B b6f887c1af054666ab7f717dfdafe5701bbc0a778169d885a1837202d4d215970af567ea620c6ef47db69fa664c6be65c782aa87d9efc1d9c8c280b6210e38f1 SHA512 df8034b347fb489735895d75e5489c264aea1b50f46a8dd512963df05cb9ba9274317b26aeca63b9b4edcf792e796659bad435ad3f3446cb397340e2bf0a5f33 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d -DIST serde-1.0.132.crate 75364 BLAKE2B 7485bcf0ae578f02f7c7dcdb284fcd6d8ccb4022b7d487e19593f3b3c9bd03a369410307dbe5ecde8071ca3ab6c7e45a5ddfe332e43076b84d67444d1f105b7b SHA512 8dac512547074a6934315ebae3e7540ef8baa225cdd58f11416b4565a1335ab317e659901fd626beffd6514c5dc6ec9fc705cc1d15e9cdd2051bd28649cca555 -DIST serde_derive-1.0.132.crate 54725 BLAKE2B 10ba0e55a498cfb469f1a36368f66515ab3e331f337b9441b08aba857dd6c824ccb718fdc33ab467413bd755db31370d4eb52039bb28e4a6c0775e2be87db896 SHA512 04f1a738b133de752fd1f4d70ffa35bbc144208bc3495ead56cda8ce65a72c501ea9c8e5e6d088cee94a878bf62509fc9f75dfadb320eb942042ee5ea80dc76a +DIST serde-1.0.133.crate 75566 BLAKE2B c6f9334c6a3f722fc3f8b75a031f3c34acf81de1488953addce546ed1dbfeb2350a2a2b25b6088920f47172e2cc9e755c4ef682c19c579a2b70e7f4ae4a7ffb1 SHA512 53f6027a23688a5a303ad9ad169a333c02272ff9c0dc827705c75c162b70040ddf676428f38d04b9aaa49ddd4cee96b5ea5e1dc03f09b90d5f12d8ad22dced0a +DIST serde_derive-1.0.133.crate 54726 BLAKE2B c59d71b857513be8b7377b4b9182b7f60e441f7fa5428939ff8a25567ab645eab8ed54178dbb4b41967b7b9073b51cdae68f5a910c91a26cfc2baad0c0344b9a SHA512 d8c18ab50c1b500dc49eed1b5ea26bb46b9adf98b3b3c6c97f9c5d11324368342188ffbfef4c8a092c69577622ec85e672341a49853a957b10bf8dcbc6c0f441 DIST serde_json-1.0.72.crate 115888 BLAKE2B 0770707160014ef19f54ab6acb6bf8cad8ae65ab47c184912aa534b927c0743e66273e93c7e3190102428bc71914ab4648bfe0c2cae9416afe6ea1d7da217996 SHA512 e48129cb5c36b4999751302fcee811b80f2113780c12e122b13d9fc7a31af7452183ff89de1793994edfdcae61a80db37aa492250a0d69e9180659418a10063b DIST sha2-0.10.0.crate 20037 BLAKE2B 44e176709b94dab3f28d21013faf0f3151b0fb29b02b76aaeea260b28090e07dc7767e354981acf76880d195fbcb4c315fdac401e1d1898a8bbb4289c4d2982b SHA512 d193e2bfe200c2e39a5d8c3381d4730bfc5da9ce112d23040cb7ce395003349b6177542bad0c18e6b3dec156f444b48a843765410064ebc42922a5b26cc6f0c5 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069 @@ -320,7 +321,7 @@ DIST symphonia-0.4.0.crate 9414 BLAKE2B aa0bbb0fe9b1a7a1732e04afcb68bfd4d9e75b82 DIST symphonia-bundle-mp3-0.4.0.crate 49852 BLAKE2B 79185d456b469ebb75e85f7fe9292b477ea63f8c17573951ae55a293e0c5f4b5cf4fd15e00428c3f4c91e968160137463fa71de9c0987c6451c178506de1d4fa SHA512 1e940b47d5d3d4eeb640a4fc4a842e5d881a5da845d7dfe0be5faa71f95b2de124f63e08dfec1b370f52442fb54867028c577749466c929387f7b53ad03eb95b DIST symphonia-core-0.4.0.crate 91015 BLAKE2B ed7edc77bdbe2ed0f676ce4570e40e4b3479162a94f0d909dc3b8737dd961f0a4aed9b15b968233a6bb79de515caa1b392801c99039c2ff0d8160f68a5ff7d5d SHA512 673b67c18a045e070979784fe4d9b343ffd543635881b89fd5c45b3b248fc0ae442ee451f669f495a10abee74a0dfa2849f3d49c1f1a7f8be0cc88f8f8f89504 DIST symphonia-metadata-0.4.0.crate 20555 BLAKE2B a75bf705ad923dfc4c7dcd1cbb82f0548b3002d2c75a7fb0ace8c37191c3ed74c9a351ef355f06b648fb932825fd7c751ac0c75478c8521be7794fcc94cda99c SHA512 82a0af7b0795ebd28e1ec54ea39a6b2e63f77f65dc6a9fd436f08128d3b863a1ff8c71ec3674445ce41b012af4e0a369196c7284e30745e1be28ab7e726e5a87 -DIST syn-1.0.82.crate 234316 BLAKE2B 1d115a4fd61cfebf62657f8faf7fe8786b3715ecf0413a5d117289853b4ecad399611d92d7bed26e590236a4689bff5599787c04f83de1db7f6c771eaa032853 SHA512 9406f62404f1dec3ea37a5e583a8dd7daf646fd5a1b11359aea3004010b3b416a44e4457695ba5beb12b3cbb9fe437de6f73018faa364c4e48060f6aab8ada1d +DIST syn-1.0.84.crate 235025 BLAKE2B 98fb0ff91c6b103588a12b718445d9cfefced59b2e66fbfff75d44b65f8c411cebb70eaa1bb0e19fbae076c87f179e8ba6231f696ad97a687b58b394c2eaca7c SHA512 c1bfbe6896e8b7e414b2241462aefe9552a5292ba58214e5ee3c70ea54f9cb5d4c77dfc3ebf3b2809bf6fbf297222b4570f2e6e3eb91931cc686d28a58c7dffb DIST synstructure-0.12.6.crate 18429 BLAKE2B 7666cd83f82910e036e5b57600dec9a1c2e559453ccc2f1201e2ee4ba64f2ee62cfc1046ded5cae64dd183967b9d71cbfe4b60a88bcb93706eedd0c4ab69be4f SHA512 6ec5dd7ade904fb6d79c2be595886289846e064b8c4100f780d8adfcbb41e6ca67f4b1d682212f4673c2169f889a042049b31161ec3cebc3f399751124f01f9c DIST tap-1.0.1.crate 11316 BLAKE2B 60786fd5f12c2f06097330c26809fdcfce62716586d2e1985f8c01406d356ed0ab730a04dfe72ee3e1d6208a53c76c66883d45a76130750b41ba5b82aa721b83 SHA512 d69ff11a46e2fbc276212511878f48eb93640c0b147df6578ea057b23625f9366a7fc3926693fc3809688537af5ca919c91605beed364decf83c35a032310995 DIST termcolor-1.1.2.crate 17287 BLAKE2B 5ff748064c9fb6663befce2fd299edf6a6deb06ea72d21a62d6e77642934cca0933e10340fa84f636631cc08c76ba83ef2284b2212759129d54248e5fccb4c49 SHA512 f37b034345382cd621b1344a3fb301ca3d4d9db8b5858ac1ea82372c983229fce3c0ea8213d6b7e91291b6034affe11e2c3e593dbd95256294ce5c584b33e14c @@ -374,6 +375,7 @@ DIST wgpu-0.11.1.crate 127556 BLAKE2B 1d4e030fd30ca27e092951f0785ff7d0cc2b79529c DIST wgpu-core-0.11.3.crate 145810 BLAKE2B aa933787da1aee6dd8a5ef2dbabdc7d463d7a61977b44e88bae709868adbbc05cab6aacda756578a7f7c110df716f8947242abd5b17d2980715d664412522487 SHA512 4877ad5b7bbe6c7497eba4d10288dcfca46f65c63ae9811f2195e3cf817b628a1c8e5978beacdf7c19e42ed9192ed0576445788f06085b25ea00b98c9d7b4d54 DIST wgpu-hal-0.11.5.crate 191366 BLAKE2B 549fb7895ce6e46ec934a4bd98108b8e252121485e91481c9096149d2c06947785fdb4aa4661aa05f54cf99f6f5a443cf84274f0d2071cbf9b1ad1bda0770a39 SHA512 622245e2378bc4cd536c2fa4e08fb8203202e39836df6ca3e0ca990b5977c13b1d5cc6495abb7578d90a6a3877b881c870fd07403a45900de4c4da4be1823469 DIST wgpu-types-0.11.0.crate 28990 BLAKE2B b19672a4f294d4e1127d32e8aff5ed2b114a23eb5e726833a7ea642a7f0ca646e688ccb98ac4f0a520fb8187a2592bf527fdb5fc90a739a8daaeb5ad035b2c6f SHA512 b5b8d6265b29899b4994deb1be3f19d5f3d7592dd56e04e4b38f4e9a2c2e9b356dbcc10ab429802a411ba4435ec4f2fcccc28cf607ff0ae4fb0daef8182c949f +DIST wide-0.7.3.crate 69975 BLAKE2B d211bdd0b1c2f2fcbf94e0e883971df78c9bcab9bc90162b867378cb315c12ca35e2156801e8ff352b85f9a2d36fcc6162032103ed5fa7fb20243ce214854de4 SHA512 ad70b5ff9d83e8ae70c0c1a47b06ab88bcca5c3c3054d2e0969375f35438236ce95c24f14a29daef304bb6629d708689e6822b18842de067a540e4940b852cb2 DIST widestring-0.4.3.crate 26215 BLAKE2B 7e5cdbb58a23004bb76cc12d451fd891ef08c05f730b059eb62a0f5e9482dde58c4059f9c0892fb1ebebbc8ee85dd20ece3ebf12c48790dca5eaeeb20b81dc34 SHA512 48561bd8a3b589f2a0328d1286177fbc6c5bc534756898912cbaab81d742b64ef898eed75073484d5e30762ceda9d2e88710074e7e9ce1a7dd43b5d871de3860 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2 @@ -387,6 +389,6 @@ DIST x11-dl-2.19.1.crate 64664 BLAKE2B 0a3a74c25e72dfb8fd786226abfc2391c245bb1c1 DIST xcb-0.8.2.crate 129071 BLAKE2B 83596850decb752c8fca84c383986e3cf1ca0708a682c083aee5e1d40d7ede2758e1a209d45745685a625d98d9438927e8f68de762bc01e843e91d9cddd16101 SHA512 276df8c84e5a416470ea5d7d29065acfa0f3b1c2f6f987242e30ceed746ee7c004257a26d01dba4f2366a76c5878b154242ed4f4cbe5b7df1b2c9c40c4d60c46 DIST xcursor-0.3.4.crate 6069 BLAKE2B 0597eb71a6ad7ad5360674c76bab042a80f1f52f490edcdd824661288eae98f2bf2c4d7da7079bffda0fbfed0409a7ddb329d855deb784fc952d1c2f2d5dbdd1 SHA512 229ea7516d8a07c3fac46b70329e89c19fcf282134b5063b8302a64f8723d31b52b4fcf23c49aecd3a3a0a736ba4a52cd033f8c3db21a775084c6c0a0e1f6c1e DIST xml-rs-0.8.4.crate 52690 BLAKE2B 140d4e725ae0e82c949838c1f6d82e1fbb00e2df4d51b74486597302d4a434ccb46bbd6f5e97636b4947c0092793928c29837a3290bb525344e8a27c0951a42b SHA512 b21b0db9ee7cdfddae7c110e4fec714d719e75ba139744c290692d660caa425aa8b1ece644deb5f1879f21c0561b9b412b9ba8931f7f5b4e220ef08f8a7fc5e6 -EBUILD ruffle-0_p20211222.ebuild 10713 BLAKE2B 44b9beb6e61fd241f212c8b3260f281bc018bfb337485504258f80961042a39df256afbdb026b185222c18c5eb61bc455e0e492097b5e54ca35bc2d5f83f4907 SHA512 f07839da5e331f910c577986c8d1c61756e8248b224b9c0c51471c74a7b88ae72117faff25f90f09f272023df46fead1f60f5bfe06459c40ecc9c0b3684188e6 +EBUILD ruffle-0_p20220108.ebuild 10732 BLAKE2B ed328f24767490906674b49b5f0ddc55da4e06aeeadc6bc39a55d065a92fc528506c0802ee7ede6fd3b35b1f53d73a4a57bd968861dd5ba86f5d520752619f3f SHA512 79d1088d648d4ea66f9b31010e6f17ea20ff9bcbcefcbfe11e1ae43a28ac56fa6ca1e3cbe4df761595aa4ae63591c6b826cff4e989a69f0fa44a369fb603d858 EBUILD ruffle-9999.ebuild 1613 BLAKE2B da4d49a9e469399303b0d80288716e7b93bbea742db4babac4abec7d02d3115f442f5ff76435c9268d19e201a7ed543a8907ae6cf78bf4f6ae644aea92c2cd69 SHA512 4bf061a0b45616292dd777bb198331fe92fe3ea60b89ef3b15bb6be3a8f6edc5c3554b95dc20d514e353b96736b64fcd21e3318de6a12e99c2fe84db11c3474d MISC metadata.xml 327 BLAKE2B aad7b4089000263fccd1bf6af04e88ac138658121db322215ce0dcc85380b12afa01cdcd2be232c5d2c773698b38903759ecaea6f4854d8c90c420c0a43f33b1 SHA512 bb5e665acc6d02ae3e6a22fbb483c293142104e538d386a9b93884f097629dcbb8ca7b614aa20e0358bf22ae36487c7d86cc1467103987845a70ebacc9c4a5d2 diff --git a/app-emulation/ruffle/ruffle-0_p20211222.ebuild b/app-emulation/ruffle/ruffle-0_p20220108.ebuild index b4a7e3d21f55..c5b84c31d3ea 100644 --- a/app-emulation/ruffle/ruffle-0_p20211222.ebuild +++ b/app-emulation/ruffle/ruffle-0_p20220108.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -46,8 +46,8 @@ CRATES=" cfg_aliases-0.1.1 chrono-0.4.19 clang-sys-1.3.0 - clap-3.0.0-rc.7 - clap_derive-3.0.0-rc.7 + clap-3.0.1 + clap_derive-3.0.0 clipboard-0.5.0 clipboard-win-2.2.0 cocoa-0.24.0 @@ -264,9 +264,9 @@ CRATES=" proc-macro-crate-1.1.0 proc-macro-error-1.0.4 proc-macro-error-attr-1.0.4 - proc-macro2-1.0.32 + proc-macro2-1.0.36 profiling-1.0.4 - quote-1.0.10 + quote-1.0.14 radium-0.5.3 rand-0.8.4 rand_chacha-0.3.1 @@ -289,13 +289,14 @@ CRATES=" rustdct-0.6.0 rustfft-5.1.1 ryu-1.0.6 + safe_arch-0.6.0 same-file-1.0.6 schannel-0.1.19 scoped-tls-1.0.0 scoped_threadpool-0.1.9 scopeguard-1.1.0 - serde-1.0.132 - serde_derive-1.0.132 + serde-1.0.133 + serde_derive-1.0.133 serde_json-1.0.72 sha2-0.10.0 shlex-0.1.1 @@ -318,7 +319,7 @@ CRATES=" symphonia-bundle-mp3-0.4.0 symphonia-core-0.4.0 symphonia-metadata-0.4.0 - syn-1.0.82 + syn-1.0.84 synstructure-0.12.6 tap-1.0.1 termcolor-1.1.2 @@ -372,6 +373,7 @@ CRATES=" wgpu-core-0.11.3 wgpu-hal-0.11.5 wgpu-types-0.11.0 + wide-0.7.3 widestring-0.4.3 winapi-0.3.9 winapi-i686-pc-windows-gnu-0.4.0 @@ -394,7 +396,7 @@ inherit cargo desktop flag-o-matic python-any-r1 xdg RUFFLE_GIT=( "RustAudio dasp f05a703d247bb504d7e812b51e95f3765d9c5e94 dasp" "ruffle-rs gc-arena 4931b3bc25b2b74174ff5eb9c34ae0dda732778b gc-arena:src/gc-arena" - "ruffle-rs h263-rs 03dcd486e88381635647a7386105cb802921b69c h263-rs:h263,h263-rs-yuv:yuv" + "ruffle-rs h263-rs b810e8c3fdb8ea5df0b7808891076e774bee40a9 h263-rs:h263,h263-rs-yuv:yuv" "ruffle-rs nellymoser 77000f763b58021295429ca5740e3dc3b5228cbd nellymoser-rs:." "ruffle-rs nihav-vp6 9416fcc9fc8aab8f4681aa9093b42922214abbd3 nihav_codec_support:nihav-codec-support,nihav_core:nihav-core,nihav_duck:nihav-duck" "ruffle-rs quick-xml 8496365ec1412eb5ba5de350937b6bce352fa0ba quick-xml:." diff --git a/app-emulation/virt-what/Manifest b/app-emulation/virt-what/Manifest index e64348785130..256a29c60b22 100644 --- a/app-emulation/virt-what/Manifest +++ b/app-emulation/virt-what/Manifest @@ -1,3 +1,3 @@ DIST virt-what-1.21.tar.gz 478767 BLAKE2B 7c48b84d9f1fe5f734921f68848b84beee2e5687a6ebfbc422a1349063e6a83c932a89cb2936239da6be033b72e6010694314cf106486cd6c54cd02652bc61a6 SHA512 14ace184c4aee5a09b855c1f5acaa619057aed1b9bf03c91ed1003e6a39ea69162c9fe452ea8162c7fe29825e0e2202cfc7d76e82f0cecea3e32405e5eb9f717 EBUILD virt-what-1.21.ebuild 607 BLAKE2B c1b875e443bb23ab8496320f5513ee0b0591dda4b33978ffcf0a8a70524c0ec11e8be248d937b11e82e80f44aba547ad4026550231dd5c465196fc543c88855d SHA512 22befae978503d1a5a2dce707de283e8dd95f189bd6fd5af9b644e7063bd1039284ba1543c6f17ed1be2dd3d657c5c89975042f98111d141fe17091c44a8e8c9 -MISC metadata.xml 464 BLAKE2B ea89b32e9ca06b0b115da3cba1b64b99dac0d06a962af45386d562655edeb63adca3e9f05dc5a432b39ba36a18ddafcfe0913db8c9c948300304c914267235e2 SHA512 6ecb026f2f2b5309c4e270f92383b28fd5627d141706eef68bc16eb6f97ba35db81a034bf8f26cf134128abee87e3e31c42420fe4dcc2f53efdf97ec2cbd8dfc +MISC metadata.xml 352 BLAKE2B 92128dbde8c4210379e7eee058e5621ec0b49c427585b09c130ae99494bf6922120029fa3c7c68414e84281a4a1aea0018bc7b3ec23189f97d6de9dae88a234b SHA512 4a5d1cbc2aaaf055bcca21bd542514a7bd45f36c78d2029438b191919fb4e139d9716036b58e13b4901e4702fb4ecf8d471686a1dec7402a973ca65c43f90e8b diff --git a/app-emulation/virt-what/metadata.xml b/app-emulation/virt-what/metadata.xml index b6f3d9b49e57..d25679ed78c7 100644 --- a/app-emulation/virt-what/metadata.xml +++ b/app-emulation/virt-what/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>eva@gentoo.org</email> - <name>Gilles Dartiguelongue</name> - </maintainer> - <maintainer type="person"> <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> diff --git a/app-emulation/virtualbox/Manifest b/app-emulation/virtualbox/Manifest index ea7ad21d2481..6fad7d931c66 100644 --- a/app-emulation/virtualbox/Manifest +++ b/app-emulation/virtualbox/Manifest @@ -12,7 +12,7 @@ DIST VirtualBox-6.1.24.tar.bz2 165754851 BLAKE2B 65bbc130281a745a00eee2a055dd598 DIST VirtualBox-6.1.28.tar.bz2 165774255 BLAKE2B fe66ab411ef8fd78ca7b5deb151b2bfc11f3625d54629e6768da9040297cea999c53873c94437f2a57b245e71db0e28bd2ad94ed557f8a1c1c674f477301e192 SHA512 d0eb49a82ec6ddb7ce7da362faf86254d324e73522001c44ab0f26a09ead3d9a800ce0d4ad3698853d4f9a4e9803ceb21f3bf50388a1855edcb2a42ce51f3a96 DIST VirtualBox-6.1.30.tar.bz2 165769447 BLAKE2B e15a8370c7cd83b547012639c3361da1b2ee40e8b094f11c22fadb95c9ddaae4791ee7cab16cb2eb23c6da4fc383f89f629335d577fa834fa1a979e19b9701bb SHA512 fab5b8327d9ad4186e584e90d1aca461d95731d0935509301e8adfe28d0737fb3ded5ac1d97e4cd1edc12c79bebb75cc675289762f9e918106f34bf6e8d363d4 DIST virtualbox-6.1.12-patches-01.tar.xz 2528 BLAKE2B a5d7cde0daea41bee2e40e46569c725769927a31865d99d13b8b13c4903e59b4097f85da15dc592b9c7e8baf8ff805397af827620f107ba09a468b4d1198ecab SHA512 f71d10a9fbce99c3f631ef30bcfa9d0e017e702ac509541b039e08ccbcd024beb93fde09c43d90af5d9d28f6842a7947f20e7950d3897da3e6d57859657e1123 -EBUILD virtualbox-6.1.24-r1.ebuild 14362 BLAKE2B 8ccb97fd50bb8546284e3bc578520c9cb543dba55075d2d314ede56afe13c50ad39e8ae32f826133826160b2f3eb4e14dc37c7f7082e6eb06cff6a45d2bac6ce SHA512 ea58fb337c6eacd8a8b0e6a92f6fd6fd9c76313699509499a8b6a30b8b9f76b6c05d6e83cd24e537fe513aef4e770b020d3d7c0c4d446eaaa96110c1cb14c1d5 -EBUILD virtualbox-6.1.28-r1.ebuild 14453 BLAKE2B 51d3b54117e11c0bdabd7ca67424a0accf5ad6bb623d8331a55e159bcbeaaac99661b9497c4d451acbc90a39f79c5804a26092c96af86dae593cb900a11bdc30 SHA512 b3d007f5f5da597f47775277d21ad97a643076456f633de834006f874338cabdbd291c10516dec6d2549c78672ba45737e54705ed7acd3a2dc70a7221d31706b -EBUILD virtualbox-6.1.30.ebuild 14454 BLAKE2B cf38e96b204a4d440be61e4f878f55a349bdd44a6f0b007093122ffa5eab0ba0b9ea6b7c0d6234742115fe4b90ab9d79f1b7371ce01fac6430e069854ce2646c SHA512 a9e2fdc3ab2dbcf6f64d98597ee428c96f55c0115ccfd8fba134a11d3a686272cc22514d9da2ee44ba66868dd0dc59d03571b9bc4a9abbc9e970dd2143bb1723 +EBUILD virtualbox-6.1.24-r1.ebuild 14485 BLAKE2B 08984c3f8af5b6d291badde1cff833baf0cee7e8cc2e207a7d87e6dd6a0cc2eebe5a58ac787fbc500639e756f0d433c27b70c5ee1f85880ccc581618684fcf01 SHA512 efaab6378ad1ffb03592edf57b0f561d1d7b360b458867b340d440238687bb19f2a61ded43b4dadafdc7468c073e09cdd05d1cc1b92bdefc18cd1dd5bded35c1 +EBUILD virtualbox-6.1.28-r1.ebuild 14576 BLAKE2B 4488d8f2834a926eda7bf7e065817be14debb7166c266af06d7ea1ae0fffb6ca826e7c04dc8429167e5e1f4c0fb11c5a19a6e117b36c90fcaa3abb2ac4a32220 SHA512 8028deada0bb4d649be01bbe9e93167855814b418767c2d79793ce526f4f3bd11c1e611fca9ca28af464278f37d61afa5bd6c91f0a3ac2541b7c0a6fc1f55404 +EBUILD virtualbox-6.1.30.ebuild 14577 BLAKE2B 390cf2379997aca1c4a3d8e90f7300a37074085ea42bdeb8fcdb0db1e57415f1670d9f613d511f80e386a58ace54d17d10b24aeb830dacc89489a083204d4710 SHA512 9a6f6daf40809efef71248f8a546fb4e695e071915bd94a87463451f120f5798f41eb54a8dc9264fc2e03d1bf3c36cbf9d189d75baeba5eb5e69c73f4ac98971 MISC metadata.xml 774 BLAKE2B 5052aaa17c815e63ef8cd450e09f220a71e8a59df1ab79ad7dd713780dd0c62ae5bc453012b35d8e37a7b0dc9b1287c3a8119f0324c4a5e8ba6211b20f5350e7 SHA512 2b0515ae0e5a280dc40b6ecdaaa9165f90b6e276e01323896509b9a2ecc01a34d4e2542788ba3166d56a242c8ed65ef1f2df6e2de62b95d11700d28036f616fa diff --git a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild index ce665d5a21ae..9452a3fe11ba 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.24-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ KEYWORDS="amd64" -IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" CDEPEND=" ${PYTHON_DEPS} @@ -179,6 +179,11 @@ src_prepare() { sed -e "s@MY_LIBDIR@$(get_libdir)@" \ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + if ! use pch ; then + # bug #753323 + echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die + fi + # Respect LDFLAGS sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die diff --git a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild index 0576c10043d7..c68f8924cbf5 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.28-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ KEYWORDS="amd64" -IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" COMMON_DEPEND=" ${PYTHON_DEPS} @@ -179,6 +179,11 @@ src_prepare() { sed -e "s@MY_LIBDIR@$(get_libdir)@" \ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + if ! use pch ; then + # bug #753323 + echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die + fi + # Respect LDFLAGS sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die diff --git a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild index 358382f4a8b7..de42d1ff09e7 100644 --- a/app-emulation/virtualbox/virtualbox-6.1.30.ebuild +++ b/app-emulation/virtualbox/virtualbox-6.1.30.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ LICENSE="GPL-2 dtrace? ( CDDL )" SLOT="0/$(ver_cut 1-2)" [[ "${PV}" == *_beta* ]] || [[ "${PV}" == *_rc* ]] || \ KEYWORDS="~amd64" -IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" +IUSE="alsa debug doc dtrace headless java lvm +opus pam pax-kernel pch pulseaudio +opengl python +qt5 +sdk +udev vboxwebsrv vnc" COMMON_DEPEND=" ${PYTHON_DEPS} @@ -179,6 +179,11 @@ src_prepare() { sed -e "s@MY_LIBDIR@$(get_libdir)@" \ "${FILESDIR}"/${PN}-5-localconfig > LocalConfig.kmk || die + if ! use pch ; then + # bug #753323 + echo -e "VBOX_WITHOUT_PRECOMPILED_HEADERS=1\r\n" >> LocalConfig.kmk || die + fi + # Respect LDFLAGS sed -e "s@_LDFLAGS\.${ARCH}*.*=@& ${LDFLAGS}@g" \ -i Config.kmk src/libs/xpcom18a4/Config.kmk || die diff --git a/app-emulation/xe-guest-utilities/Manifest b/app-emulation/xe-guest-utilities/Manifest index d1633afc3864..a20eb3b27273 100644 --- a/app-emulation/xe-guest-utilities/Manifest +++ b/app-emulation/xe-guest-utilities/Manifest @@ -1,6 +1,6 @@ AUX xe-daemon.initd 628 BLAKE2B 2307505518a79ff929dd8559ceea7e25df88f8b32e589228b64a50e1117c0cfa7da6d43fe5f4b32add62dbc24f5da02d959a06602b973546777bc36558547e99 SHA512 0278202ff6ce4d8537fd56293844039cee438d5487bb5bd843634f7ca91a0ade2afe5d5b5e5fbc3715e5ef3966ff58772a3540ae9e3cbc19b19eac4266b953b6 -AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4599 BLAKE2B 6bcbd37c9386ed91635d23cbe43ea07ea321063d4c859688735303f14734b08b7895886f49791c000d64eff0e9b458f266a2c921e7c4fd202cd6d10fafcf1b76 SHA512 c9147d9a93b45d7300441b6c398c27bf3c38d39c0a6908f80a2708b8c26329c9b138522ca3b7ae7b4af2ace3b43ededda03dd39b9c8cafd31dbe32beae739690 -AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2146 BLAKE2B 6875bf6ff48acd48cee2e590402cc546dd53df8a0861a6941b2de0d8c8caeb509f107d2b24c4e5c5d665890c15972c84c80c299eab718ec81131dc0594b6a5ec SHA512 93f5c1445b7ee449fedaed3c73a3f21b6adc0fad67d90e3bb35213749ae659ffae85dec3ddf43d4b5df21500e8b651651dd7496a2ffb8fa2d9091dd246c839de +AUX xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch 4508 BLAKE2B 94a4af56898bae5a79cf47b0ee96270a427a78d4c3e51541545e695ad3df0906bf394db0fa8a189bb55807066a70bf66ce3e21079014f2dc5eb644a1645cf785 SHA512 bb36bc82ce014d203c0005f905acf8d7a4586b88f5096ffaadbf8bfb51d9597e847b155ef9780493099338d53868abafd8a50761c4183a55f3981dae8dfe9c3b +AUX xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch 2055 BLAKE2B 0ea0c68134ff4969066d69ea64d0ac5fffa8c2b649538cf273819e3888a1352ada8ebf23795a9bc5b5ddeae41adde925e8cd5f1a3ecb555d5a2dd66a82630b42 SHA512 6a5691e2156a1b147bd456af8acfaad5c6e2aa404e085c54dce642a8c09e77a5fd518d46d80063a5690c675796ab8cec0ecd36849573fe4bcbce905c725c14e9 DIST xe-guest-utilities-6.2.0-1120.src.rpm 566881 BLAKE2B b2c727c551996f218c021d509ba1841baa07c70cbaf7660c0ec9cbeae696c4e77921d8ca12e8dfdf934a6894058c62ee6bf4e86bd1918e304cc76ee28d396fad SHA512 b945b3bf8175816b41b3a07a7dd8f0d9d2fdb1a7144448a5bb7fb4b6729736c67cea88fd45031df41abdd99416addb17fa1ee9cfe1fc76acf610cde3b3213880 -EBUILD xe-guest-utilities-6.2.0_p1120.ebuild 1500 BLAKE2B 42233eba29d6748e4bfda2ad162b94fdc380797ff773bc389c5bfd1a2126c41021b8001dfa87c62495f63eacd9f728254aacb684d81d8107f6e5a0b4a83fa22a SHA512 8ea1175a64528178645256f030d0cc4818c8318cb87681268c3b3fcb64c0e156107dadf36d40f20da86af52a533a392e65818a0029cbe67c358b83fe3daeee39 +EBUILD xe-guest-utilities-6.2.0_p1120-r1.ebuild 1483 BLAKE2B 2ad9f008b0b04625797dd799a34c0315f1446bf182ffc9f05414db6049e6cf5d4c433a2c757af444be3673a9043f57ab50fc09f5583f73304a65f0622ef9e6c5 SHA512 f09206181abef7023facb72c51704a0650ccf9c30c86a5029801a52613e8cab7595f91a48949a171ae5a03d6859e9164b079ec7232693cb7e25f586a2f9d5376 MISC metadata.xml 791 BLAKE2B fc1e107b5d409edbff73ee781c03e81d113145f4a7424fafef60cbc876959e8ba6ccbe2f1f83ee75172647f7cad0fd4ff43c9aadde75d176ffb1626125820a68 SHA512 f475e1a5b4f50bb9c3de828ba2d0433e6eb54706c207fc7591aa16d5c2ac128b6649f77dd751f65e901280a47a9cb690599b57f625858bca580ebc34036048cf diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch index d431cdfcf999..29c8ebc91074 100644 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch +++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Guest-Attributes.patch @@ -1,5 +1,5 @@ ---- usr/sbin/xe-update-guest-attrs.orig 2013-06-14 07:57:18.000000000 -0500 -+++ usr/sbin/xe-update-guest-attrs 2014-04-19 13:38:14.627477193 -0500 +--- a/xe-update-guest-attrs ++++ b/xe-update-guest-attrs @@ -1,6 +1,7 @@ #!/bin/sh diff --git a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch index 45b0bbc56c69..d1ec22668603 100644 --- a/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch +++ b/app-emulation/xe-guest-utilities/files/xe-guest-utilities-6.2.0_p1120-Linux-Distribution.patch @@ -1,5 +1,5 @@ ---- usr/sbin/xe-linux-distribution.orig 2013-06-14 07:57:18.000000000 -0500 -+++ usr/sbin/xe-linux-distribution 2014-04-19 13:54:13.270477193 -0500 +--- a/xe-linux-distribution ++++ b/xe-linux-distribution @@ -1,6 +1,7 @@ #! /bin/sh diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild index 9fdc1dc8bc30..5c0e8352fb77 100644 --- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild +++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120-r1.ebuild @@ -1,38 +1,45 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit epatch rpm linux-info -DESCRIPTION="XenServer Virtual Machine Tools" -HOMEPAGE="https://www.citrix.com/" +EAPI=8 + +inherit rpm linux-info + PV_BASE=${PV/_*} PV_FULL=${PV/_p/-} + +DESCRIPTION="XenServer Virtual Machine Tools" +HOMEPAGE="https://www.citrix.com/" SRC_URI="http://updates.vmd.citrix.com/XenServer/${PV_BASE}/rhel4x/SRPMS/xe-guest-utilities-${PV_FULL}.src.rpm" +S="${WORKDIR}" + LICENSE="LGPL-3 LGPL-2.1" SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="xenstore" -DEPEND="app-arch/rpm2targz" + +BDEPEND="app-arch/rpm2targz" RDEPEND=" !xenstore? ( app-emulation/xen-tools ) - xenstore? ( !app-emulation/xen-tools )" -S=${WORKDIR} + xenstore? ( !app-emulation/xen-tools ) +" + CONFIG_CHECK="~XEN_COMPAT_XENFS ~XENFS" QA_PREBUILT="usr/bin/xenstore* usr/bin/xeninfo" +PATCHES=( + "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch + "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch +) + src_unpack() { rpm_src_unpack ${A} # Upstream includes xenstore-sources.tar.bz2 # but it is NOT the complete source :-( } -src_prepare() { - epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Guest-Attributes.patch - epatch "${FILESDIR}"/${PN}-6.2.0_p1120-Linux-Distribution.patch -} - src_install() { - newinitd "${FILESDIR}/xe-daemon.initd" xe-daemon + newinitd "${FILESDIR}"/xe-daemon.initd xe-daemon dosbin xe-daemon dosbin xe-linux-distribution dosbin xe-update-guest-attrs diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest index afba515c42eb..b189e50178d9 100644 --- a/app-emulation/xen-tools/Manifest +++ b/app-emulation/xen-tools/Manifest @@ -34,6 +34,6 @@ DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c598317 DIST xen-gentoo-patches-23.tar.xz 20536 BLAKE2B 0064f79f8794a21ab13047a4ee296e37efa616e16ca6cd65b31fdafeb458fd9b80f0443758343c8328b1901d7169618346becfe75f16dcaeff08fc975f1d08d5 SHA512 09248e17ff7865feb2a505169d62ee5c8c60bd672fa8c4c7c4e3a2e4af58bfad0379d37b395bab3e3393af8d53d882f56749dfeb560edeea6b7ab56c902a3c49 DIST xen-gentoo-patches-24.tar.xz 20952 BLAKE2B 292ea384f007a9615ca840068c45cd0e37a63a59e596c9c87a278a0136805327c85f5e5576eac751e40bda616559e413b396d313d43f2d36d904f09a41b0d302 SHA512 26b7344cea40ef44d1eaec330465071c96ee27a5b0ca91f787fc80c6801abed47cab9050a40ef80f20471a7cd9ee0dc7aaa46b16e5af7d0e50643ccc7d3a828b EBUILD xen-tools-4.14.3.ebuild 17085 BLAKE2B 307122a50a4d2869b17d52c81644644c2e154faff80022b5a61fa71441ca92ba75d767f0cbda99f83f6f1ff519076b299b46caf87cf2004474f6d61fcf51eba2 SHA512 add91512fab0dd7f92d6e7eb6451653556ca73d3b7e44e66387f1944fc0a1c93f3fbf9e8de879d55d2fcf3d2077ad370d8b161f9569a03dce26b87fbbb81c8c9 -EBUILD xen-tools-4.15.1-r2.ebuild 17882 BLAKE2B a6b7b8123399256fc9371a02eade6ac052e35521b0c2f83887a816d945c2aa451d2dfd3bac0abddcf3788c278dd48bc80ab1eed2de6fc4d93b33e7550a2c459f SHA512 d6d517233587e9a29dbf4598160d058dd699a91df1b7ede2f670bca897317eb66a917ebb38f267ab23db80620d43d397ac0d067bbeb7023004f9e38f6ad30a59 +EBUILD xen-tools-4.15.1-r2.ebuild 17880 BLAKE2B 86a2fa11d9c57a2a3a1565fc2da415248d4b40d86c57bf1a99cd4dc76c43c42e83b1a91f4a1700d4d8a996bf27306ff68b74c792abea72fa76f249474716f21c SHA512 73a7fa4a820f7ebb7a63f3e29d7a7ec4f6627fa452d924ba5eca0980c8001b19f38645f174848913b7ac2f8a4d6d96b93e8421ac1e5a3720036cded1d4a6fd0b EBUILD xen-tools-4.16.0.ebuild 17927 BLAKE2B 87adf30cda85c9fd448db6bdc410e0a2705b8f341e627d48cdc9ee981858a08e975a9b3d6f825d32e217d86733f65e37b09b7819f1a7406080c3231abf841587 SHA512 8097dffbdb00812246035ceea81f7500543ef44059ccd26f9f72498fff1192994d6cf3a8e92fcce4414416aa43305ab850a33013696c7116ce43c874623d143f MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7 diff --git a/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild b/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild index 1bd53de373b8..04d25574dae1 100644 --- a/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild +++ b/app-emulation/xen-tools/xen-tools-4.15.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -16,7 +16,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/${REPO}" S="${WORKDIR}/${REPO}" else - KEYWORDS="~amd64 ~arm ~arm64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 x86" UPSTREAM_VER=1 SECURITY_VER= # xen-tools's gentoo patches tarball diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest index dce4b848907e..6e236dd4350e 100644 --- a/app-emulation/xen/Manifest +++ b/app-emulation/xen/Manifest @@ -1,13 +1,13 @@ AUX xen-4.14-efi.patch 1969 BLAKE2B dec62e9b04ce23025443caa68df2fd69c50a3fdf650bf26047b28f3a72d1aa58124127274cd2c1373a4e133784b2691145c49c9a182bd635aa9c60bb1e45a0c1 SHA512 3e32aac5ba2ec371a3877d64532e8d134c3b4fe3a6644477ee8ecf56cbb8378b20f9d5d7415bec891d96910550a787848779c82ee4b9d57046f4c13235531ea0 AUX xen-4.15-efi.patch 2181 BLAKE2B a06b944dea37c3dfdbe4344191ec4a286348f46bcccf1b5a75f061e55b961d767972456803b8c9aa15120b2b2497651495e903925bf93b04c483e0713d9117a9 SHA512 7ec52fc65b5b8a22877c941f0ab6f249ba1d7b40ad7d50d8f0ac793069cc0eb85b1e5394ce81adf60fa23b01ecc8ce983e6c508b8e0d22189dc46e2c1ad8c1b4 AUX xen-4.15-flask.patch 400 BLAKE2B 68ee04b8b0923cbe7e2b93b834a23b465c9c8e63ae41bea98c8b4bce4ff59374534294b8c5cd5be30ea64d7c66caec54de0bc1bf70d80275d027b3a082ec2003 SHA512 146c6a161d3def5ab947264d6ac5932066f3124e25be14185ebd75eaa18932adcf35daf21edd051861cacd28b950b6a3ee5c5ac335ccc1d0e27b3242da5c4441 -AUX xen-4.16-efi.patch 2107 BLAKE2B 67cf3fa6f3505c9f54820f535e7d74eba087390c3f7a9a13ef57a6cd700543e2b3fe536a1212f4e6702c6e5f4b4bd97b7e72900754977cab5540512e4a389692 SHA512 64b3b07de8bb7b7a827a004095ae6017d972b4a5cfe22329f77b0d553ba7722031569d033eeb74113fee94c01c2784647fcfd165d1b7d4a8111985767c5dd736 +AUX xen-4.16-no-symlink.patch 1044 BLAKE2B 3f5cb93403e3cd606a5eabb8b0e7facb3c95ae7f805c4bfa0e5a357342b845f6f260915f9eac46573bd9813fa602702df6254ad4b946fccb32cfea7514cc86b3 SHA512 0d1a8c8dbfdd57dac6d9732afcf4d0da1746ecbfa06689eb343b3d54167a784c9b9b65555f4cabd8f30a97692c511ee16c7787cdc3d335f7e39c2e3f8fc86ccf DIST xen-4.14.3-upstream-patches-2.tar.xz 28336 BLAKE2B 45666fd4aa81c5b8d3c13f5fa949f30a3c168c3ece0109f66092a93d1c2c204dda21afdb46357ca836f763cddaa66a9dbe895939294db36ed28a348e0d92d072 SHA512 c80c4e1cf6c5b870d3471b7430478f1180704d55b5327ef0748e2dc5c3bc03eee05003888160a802b439a6a11aa6bd047122f340ea0cdc1b6bfd71371090e827 DIST xen-4.14.3.tar.gz 39982036 BLAKE2B 927fd2937f451567238702430cea3a6e5d2db70d5eef10f029bb1d6d030681573c851eb8076c8bad89c97c115f81a19ac8e46e78ca3f0e642565f7300c264ca1 SHA512 b462fcc1549f6e57f7f2a4fd10ce1e957a25a6a7c0319672b62699468f6c4330b9cd0cf2b0231b5cce94f4bb142a957eb8aa58aa0ffb5c85b37211d6b34ccf16 DIST xen-4.15.1-upstream-patches-2.tar.xz 30180 BLAKE2B 675c13cfb4a6f47121dfe125ddea21d98e7e37563f63b91cde96cd92d94eff648eaa65426fec09833ad668102959948b2e684860631db2b5a2a53b2521a01069 SHA512 f0a6c0829068828ac400d67230d3066b2370a90303e537dd5e0761920ac0d584139b59244a72d9dcd2e4cb1a151ab80d3197ba908e642e13817b89b9a33c73fb DIST xen-4.15.1.tar.gz 40800852 BLAKE2B 39475ea33f029fb0e84b82b4a2b13fd613bab01e3ef6c241dfede3d190ee9be53c99b62121d37d83b1e078764b3e4d88d1dfb99be1b5623691e56519850c6798 SHA512 8d3cbdf708f46477e32ee7cbd16a490c82efa855cecd84ee712b8680df4d69c987ba9ab00ff3851f627b98a8ebbc5dab71f92f142ed958ee2bc538bc792cd4b9 DIST xen-4.16.0.tar.gz 44982322 BLAKE2B 7e16a93b3f1131e2b10307fabc10641a9c5983173155b9a35eaf6ff317b6a747bccf6b8c87c06686830acc2c4bd3e19e5867eb443eabac9a1e4ee59124dfa87f SHA512 2869ed90d1779c9754d7f2397f5fc67a655304d9c32953ac20655ef96cb154521d8fce9f23915ac0c91f984dc54f72c67e5e619e2da318b5997748f44cf21b87 EBUILD xen-4.14.3-r2.ebuild 4408 BLAKE2B 46ca07316dd866afdfe43386665acc3552c5ebc0c8d289d1f59c752f2be948122cc550c2e8fa2583cc1ef172f6e5026d6c16bdcd57bbc9b72f1bf917c65b2a68 SHA512 2afd50d4c3c6bee62a6fc8eb17f90caf400906dc8f7fa3a99610d22680eb7e5192a8a83e24ef5d703c04a94e50d72ed4758d9e97a2b89d1a931a304b9639d745 -EBUILD xen-4.15.1-r2.ebuild 4409 BLAKE2B 22601b8aedb52c39d584837ea28eba60c2a229b244d28f19f49ee7e8cb60a62a6b0fe75fbbeacc7b91f6954fe561c82fbef78a900efe1c701bd700a60967dcde SHA512 9ee6862e2487a26cee46c8ed909ed9cb33d599cb6ecff829733292b661ddfa312ffde89957e7fc97f6b2d537a7646115ef6d0b3ff81990e64220272a8b461464 -EBUILD xen-4.16.0.ebuild 4409 BLAKE2B a5d61c1e953ae1d5a9905c0492f2a03bdcc6b62e2d3b606f66a5871ea856d8dc5c36fe3541011cdc086b66338c138a5cb9d3970ca5b04aca32e79dc6ab4bceb7 SHA512 94158f5d4461052b547e48e0c1823501d635d1ef822d493e17b1053d4cd9ca71fda5e3a0108c725d9085757d1d9893bde4a80e2c2f8a85f45658b31eea6b71ad -MISC metadata.xml 676 BLAKE2B 23003620a5ae9ecc8fca8bea77951fdf0469bb3b997819bfaccb7be4ece20b8a2c2f4b3385f1fc04e749d40a3f2353ed8559806049069fa6bf6bcbe43921db03 SHA512 027f25045231ae0425f5d60e7cf0981654f9e0f445ebfecdee9d7ca0f13272c0edc0440faf9bca85feb55711391d4e3dce402b138a5d4e72f30aa7ee680e14fb +EBUILD xen-4.15.1-r2.ebuild 4408 BLAKE2B f2870cf9b704b5871d61fac799e0ffdc59d914fbcd49d67e6c5125d5f2f4094ae32ff6987c0bb7371de8271d5292c720e5f1a8c263c05c3abda1ca562565b600 SHA512 46624811280430ff388cc6089d60b5142d96a7b22f2e09b02b1ceef0f476997a1755146b9eabef84ff8d8165c059cff76efa753273dedef51a692e91a9f543d0 +EBUILD xen-4.16.0-r1.ebuild 4485 BLAKE2B 6dbaccad0866a01d32e99286568423e558b3e19252c939ddba1017eaa9c5b0e946a95a30ef6b67e89702415aa0d079e65095f0a216d39afb20f6bbf4053b94fd SHA512 eaacd8e41fd113090270e868fa99c1681d62057bf6edae7d4f0348757994a20a51e90b2f513d2fa0e2055032a8e605ef29c26bc7f2f368d8856c38805e91c4d6 +MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9 diff --git a/app-emulation/xen/files/xen-4.16-efi.patch b/app-emulation/xen/files/xen-4.16-efi.patch deleted file mode 100644 index 1285c421f3d2..000000000000 --- a/app-emulation/xen/files/xen-4.16-efi.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/xen/Makefile b/xen/Makefile -index dfb0efcc..3bd51ec1 100644 ---- a/xen/Makefile -+++ b/xen/Makefile -@@ -311,9 +311,17 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) - _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) - [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) - $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) -- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) -+ -+ if [ 'x$(EFI_VENDOR)' == 'x' ]; then \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ else \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z); \ -+ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z); \ -+ fi; -+ - [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) - $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) - $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map -diff --git a/xen/arch/x86/Makefile b/xen/arch/x86/Makefile -index 69b6cfad..d8b09d95 100644 ---- a/xen/arch/x86/Makefile -+++ b/xen/arch/x86/Makefile -@@ -127,7 +127,7 @@ export XEN_BUILD_EFI := $(shell $(CC) $(XEN_CFLAGS) -c efi/check.c -o efi/check. - CFLAGS-$(XEN_BUILD_EFI) += -DXEN_BUILD_EFI - - # Check if the linker supports PE. --EFI_LDFLAGS = $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 -+EFI_LDFLAGS = -mi386pep $(patsubst -m%,-mi386pep,$(XEN_LDFLAGS)) --subsystem=10 - XEN_BUILD_PE := $(if $(XEN_BUILD_EFI),$(call ld-option,$(EFI_LDFLAGS) --image-base=0x100000000 -o efi/check.efi efi/check.o)) - # If the above failed, it may be merely because of the linker not dealing well - # with debug info. Try again with stripping it. diff --git a/app-emulation/xen/files/xen-4.16-no-symlink.patch b/app-emulation/xen/files/xen-4.16-no-symlink.patch new file mode 100644 index 000000000000..8aed75b520c5 --- /dev/null +++ b/app-emulation/xen/files/xen-4.16-no-symlink.patch @@ -0,0 +1,17 @@ +diff --git a/xen/Makefile b/xen/Makefile +index dfb0efcc..1816eb66 100644 +--- a/xen/Makefile ++++ b/xen/Makefile +@@ -311,9 +311,9 @@ _install: Z=$(CONFIG_XEN_INSTALL_SUFFIX) + _install: $(TARGET)$(CONFIG_XEN_INSTALL_SUFFIX) + [ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR) + $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_FULLVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) +- ln -f -s $(T)-$(XEN_FULLVERSION)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION).$(XEN_SUBVERSION)$(Z) ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)-$(XEN_VERSION)$(Z) ++ $(INSTALL_DATA) $(TARGET)$(Z) $(D)$(BOOT_DIR)/$(T)$(Z) + [ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR) + $(INSTALL_DATA) $(TARGET)-syms $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION) + $(INSTALL_DATA) $(TARGET)-syms.map $(D)$(DEBUG_DIR)/$(T)-syms-$(XEN_FULLVERSION).map diff --git a/app-emulation/xen/metadata.xml b/app-emulation/xen/metadata.xml index c9b2f33aa70a..68e9c297bc42 100644 --- a/app-emulation/xen/metadata.xml +++ b/app-emulation/xen/metadata.xml @@ -14,6 +14,7 @@ <name>Gentoo Xen Project</name> </maintainer> <use> + <flag name="boot-symlinks">Symlink xen.gz variants in /boot, disable on fat filesystems</flag> <flag name="flask">Enable the Flask XSM module from NSA</flag> <flag name="efi">Adds efi boot support, requires LDFLAG -melf_x86_64 for amd64</flag> </use> diff --git a/app-emulation/xen/xen-4.15.1-r2.ebuild b/app-emulation/xen/xen-4.15.1-r2.ebuild index 9170b0ac6fc9..c47eb7e424a0 100644 --- a/app-emulation/xen/xen-4.15.1-r2.ebuild +++ b/app-emulation/xen/xen-4.15.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="git://xenbits.xen.org/xen.git" SRC_URI="" else - KEYWORDS="~amd64 ~arm -x86" + KEYWORDS="amd64 ~arm -x86" UPSTREAM_VER=2 SECURITY_VER= GENTOO_VER= diff --git a/app-emulation/xen/xen-4.16.0.ebuild b/app-emulation/xen/xen-4.16.0-r1.ebuild index 5cbf9f980141..ea9f254e98d2 100644 --- a/app-emulation/xen/xen-4.16.0.ebuild +++ b/app-emulation/xen/xen-4.16.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -37,7 +37,8 @@ DESCRIPTION="The Xen virtual machine monitor" HOMEPAGE="https://www.xenproject.org" LICENSE="GPL-2" SLOT="0" -IUSE="debug efi flask" +IUSE="+boot-symlinks debug efi flask" +REQUIRED_USE="arm? ( debug )" DEPEND="${PYTHON_DEPS} efi? ( >=sys-devel/binutils-2.22[multitarget] ) @@ -54,8 +55,6 @@ RESTRICT="test splitdebug strip" # Approved by QA team in bug #144032 QA_WX_LOAD="boot/xen-syms-${PV}" -REQUIRED_USE="arm? ( debug )" - S="${WORKDIR}/${MY_P}" pkg_setup() { @@ -94,8 +93,10 @@ src_prepare() { # Gentoo's patchset [[ -n ${GENTOO_VER} ]] && eapply "${WORKDIR}"/patches-gentoo - # Symlinks do not work on fat32 volumes - eapply "${FILESDIR}"/${PN}-4.16-efi.patch + # Symlinks do not work on fat32 volumes # 829765 + if ! use boot-symlinks || use efi; then + eapply "${FILESDIR}"/${PN}-4.16-no-symlink.patch + fi # Enable XSM-FLASK use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch |