summaryrefslogtreecommitdiff
path: root/app-emulation/qemu
diff options
context:
space:
mode:
Diffstat (limited to 'app-emulation/qemu')
-rw-r--r--app-emulation/qemu/Manifest12
-rw-r--r--app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch5
-rw-r--r--app-emulation/qemu/qemu-6.1.0-r3.ebuild11
-rw-r--r--app-emulation/qemu/qemu-6.2.0-r1.ebuild11
-rw-r--r--app-emulation/qemu/qemu-6.2.0-r2.ebuild13
-rw-r--r--app-emulation/qemu/qemu-6.2.0.ebuild11
-rw-r--r--app-emulation/qemu/qemu-9999.ebuild15
7 files changed, 29 insertions, 49 deletions
diff --git a/app-emulation/qemu/Manifest b/app-emulation/qemu/Manifest
index a7fed670a342..6a8b84d9a927 100644
--- a/app-emulation/qemu/Manifest
+++ b/app-emulation/qemu/Manifest
@@ -7,14 +7,14 @@ AUX qemu-6.1.0-automagic-libbpf.patch 887 BLAKE2B 9c74ea440dbd958368ae41b4d39cf8
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-user-SLIC-crash.patch 6790 BLAKE2B 0b8591cd8d9ed4a9622b86085c58982cf93f24c68493f167c5dd3ee6a4e768ca51da99a9a37c2b38b605faa191c279986bc123b21a8701bfbaf8c7066b717643 SHA512 7a652e80923c2b1bb310babf8cc0fa21f90b1e88f7a9949ef9227381321cdd52778df74a51e7be6fd3c7d985f16d76b27d589460b0688ab0e14b862a5bc18c36
+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 25867 BLAKE2B 497e582bcab33ed8029df19be0f2cd5bdd4c0c6b767f9b1a17e7919d5bcd8a4089b786358408731385525d39fd9c4f5e2676c994727b96654438e44c992f010e SHA512 6660cfae20a0e32aea228a9b96dcb5ee328722c39214ed209c0e4fa693a319166ff36b58e02a86e305c267197f343f8feda5421303c57be3062f0e9c5347f282
-EBUILD qemu-6.2.0-r1.ebuild 26109 BLAKE2B 857fc00133a10acce980cce0a50356c16daf3523dcd8aa172b124a604794c81b1236faf190a27fadf2894cccf7000a65de7851e413ec610fd7d1799b060bb307 SHA512 938fcf70a931c05100bde00e4495ed151f98daf7efd1e2b540ca53c571bd0a8058a4fbe06501dc03a170b3055d97d6e8da41012d3b2ad6a4606306c6527702af
-EBUILD qemu-6.2.0-r2.ebuild 26194 BLAKE2B d0ae118fef80f12550f4e01671d7ef08faac05516bd0af7fcac40860a6d8b09ad98a78f5b012f3732377a6810ae71c2e3c157ae39f214578511cafd8cf3b89de SHA512 537266e8d326fd0d5d747b66397a8df9d1402a1975405b1f9c3b09c8bef802860166b995c64344657e05b5506c14b9ea8699d614899c8a83c0d3f8f40e97dd72
-EBUILD qemu-6.2.0.ebuild 25898 BLAKE2B 734579b79328f3422f87d92ced8d03cb797b42d390870c7a8119226c59fce67b1190affe7bf130ee1666fb3cd9960d8d4f5286c499893fc58531cdf51a3f7873 SHA512 816a28e2d9f51932b845563d7abb699a24fd9aa3767adc71760afbb4361a0138ba53410cbe0ed28f71f8f94bdee49bfbc7cc05ba5aea96f232330ddd83bd3655
-EBUILD qemu-9999.ebuild 26140 BLAKE2B fa1d54bf086390e6e5c198c4895ff089a13216ce7e5ccf13e97402021595a396866bee536a7daf71960186beeefb4265ae011d1408829f0eaf475b39ac650355 SHA512 e51f14a50ecbdf822bbad96413c702a4df7650b86a705889df145269168776fd7bc0009ad97801b3864c03747b6e4a5e44b5dc4805b12d8dec4c24248cee02d9
+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.ebuild 25693 BLAKE2B 3cf29a95b24e1a1c777605d793caa8c9bc684e1ef37ce9fe8f55988fa5aa29ea140343a405755a07cb313f9a7e3dac42d10543797b41f70b8711cefc02b0e501 SHA512 d2243ffaeeb92d02717863b1dc09db06eaefdca17a934914b5f2d00fa3429f2ac52a154661ac7937cf0703f4392fb19eb1cde9402a88a5d79c5e9d89463199a4
+EBUILD qemu-9999.ebuild 25942 BLAKE2B 140e043acc2c845e6c877e88097498fef09c554ce7ca819e26ecad4605b5d454e074394dc78e4df2b65fee2f016316e47e01713646aa5fa9bae8db0b1856efd4 SHA512 d5956f8bd2ba4af79475512599f41b17192b6d696c45b59a0e4ec9034843593c1b8968177a1a781a51fd4cf5e562f430463220c078d3f4bd42fd439d0762d7b2
MISC metadata.xml 4590 BLAKE2B 420dff5c9595ed662f5c5963543d63e768b4db9b77518a1d84dca09daef2b6b2c5c089955804af9277cd26533eac8148b93c9d1c2c9cc4285d141a321af2b6e1 SHA512 9c85bf9834eaf1b450807931c05a32c843a247b614ecb26e82151828a5c4be2d95510119b7431c563d3ac5d48126ffc99e9cb654d94f361e4c2d2c7fc6347dcc
diff --git a/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch b/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch
index 7d22feeade2a..76809782b5f7 100644
--- a/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch
+++ b/app-emulation/qemu/files/qemu-6.2.0-user-SLIC-crash.patch
@@ -1,3 +1,8 @@
+Gentoo bug: https://bugs.gentoo.org/830170
+Upstream bug: https://gitlab.com/qemu-project/qemu/-/issues/786
+Patches taken from
+https://lore.kernel.org/qemu-devel/20211227193120.1084176-1-imammedo@redhat.com/
+
commit dce6c86f54eab61028e110497c222e73381379df
Author: Igor Mammedov <imammedo@redhat.com>
Date: Mon Dec 27 14:31:17 2021 -0500
diff --git a/app-emulation/qemu/qemu-6.1.0-r3.ebuild b/app-emulation/qemu/qemu-6.1.0-r3.ebuild
index 8d2ca068f00d..32c26eaa3055 100644
--- a/app-emulation/qemu/qemu-6.1.0-r3.ebuild
+++ b/app-emulation/qemu/qemu-6.1.0-r3.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"
@@ -34,8 +34,8 @@ 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 kernel_linux
- kernel_FreeBSD lzo multipath
+ 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
@@ -634,11 +634,6 @@ qemu_src_configure() {
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
diff --git a/app-emulation/qemu/qemu-6.2.0-r1.ebuild b/app-emulation/qemu/qemu-6.2.0-r1.ebuild
index 3f1ccc352eb5..0db52dfb3320 100644
--- a/app-emulation/qemu/qemu-6.2.0-r1.ebuild
+++ b/app-emulation/qemu/qemu-6.2.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=7
@@ -34,8 +34,8 @@ 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 kernel_linux
- kernel_FreeBSD lzo multipath
+ 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
@@ -642,11 +642,6 @@ qemu_src_configure() {
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
diff --git a/app-emulation/qemu/qemu-6.2.0-r2.ebuild b/app-emulation/qemu/qemu-6.2.0-r2.ebuild
index 481bf31b0386..10b0bf44d7de 100644
--- a/app-emulation/qemu/qemu-6.2.0-r2.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0-r2.ebuild
@@ -34,8 +34,8 @@ 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 kernel_linux
- kernel_FreeBSD lzo multipath
+ 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
@@ -472,11 +472,9 @@ qemu_src_configure() {
$(use_enable alsa)
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
- $(use_enable doc docs)
$(use_enable jack)
$(use_enable nls gettext)
$(use_enable oss)
- $(use_enable pam auth-pam)
$(use_enable plugins)
$(use_enable pulseaudio pa)
$(use_enable selinux)
@@ -523,6 +521,7 @@ qemu_src_configure() {
$(conf_notuser capstone)
$(conf_notuser caps cap-ng)
$(conf_notuser curl)
+ $(conf_tools doc docs)
$(conf_notuser fdt)
$(conf_notuser fuse)
$(conf_notuser glusterfs)
@@ -541,6 +540,7 @@ qemu_src_configure() {
$(conf_notuser nfs libnfs)
$(conf_notuser numa)
$(conf_notuser opengl)
+ $(conf_notuser pam auth-pam)
$(conf_notuser png vnc-png)
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
@@ -647,11 +647,6 @@ qemu_src_configure() {
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
diff --git a/app-emulation/qemu/qemu-6.2.0.ebuild b/app-emulation/qemu/qemu-6.2.0.ebuild
index bfc38240e3a6..36d76fd8c8bf 100644
--- a/app-emulation/qemu/qemu-6.2.0.ebuild
+++ b/app-emulation/qemu/qemu-6.2.0.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
@@ -34,8 +34,8 @@ 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 kernel_linux
- kernel_FreeBSD lzo multipath
+ 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
@@ -637,11 +637,6 @@ qemu_src_configure() {
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index e84304a7ae78..7f3efa61e35b 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -34,8 +34,8 @@ 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 kernel_linux
- kernel_FreeBSD lzo multipath
+ 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
@@ -107,7 +107,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
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? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
static-user? ( !plugins )
vhost-user-fs? ( caps seccomp )
virgl? ( opengl )
@@ -471,11 +471,9 @@ qemu_src_configure() {
$(use_enable alsa)
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
- $(use_enable doc docs)
$(use_enable jack)
$(use_enable nls gettext)
$(use_enable oss)
- $(use_enable pam auth-pam)
$(use_enable plugins)
$(use_enable pulseaudio pa)
$(use_enable selinux)
@@ -522,6 +520,7 @@ qemu_src_configure() {
$(conf_notuser capstone)
$(conf_notuser caps cap-ng)
$(conf_notuser curl)
+ $(conf_tools doc docs)
$(conf_notuser fdt)
$(conf_notuser fuse)
$(conf_notuser glusterfs)
@@ -540,6 +539,7 @@ qemu_src_configure() {
$(conf_notuser nfs libnfs)
$(conf_notuser numa)
$(conf_notuser opengl)
+ $(conf_notuser pam auth-pam)
$(conf_notuser png vnc-png)
$(conf_notuser rbd)
$(conf_notuser sasl vnc-sasl)
@@ -646,11 +646,6 @@ qemu_src_configure() {
echo "../configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
-
- # FreeBSD's kernel does not support QEMU assigning/grabbing
- # host USB devices yet
- use kernel_FreeBSD && \
- sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 11:32:25 +0000