| 1 |
commit: d1ccaba75b064ef53978062df4edd341cb752405 |
| 2 |
Author: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 26 22:35:12 2022 +0000 |
| 4 |
Commit: John Helmert III <ajak <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 27 03:26:22 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ccaba7 |
| 7 |
|
| 8 |
app-emulation/qemu: --disable-blobs for user builds, not for softmmu |
| 9 |
|
| 10 |
Also add a comment explaining new vhost-user-fs logic while here, and |
| 11 |
clean up dead and commented configure arguments. |
| 12 |
|
| 13 |
Signed-off-by: John Helmert III <ajak <AT> gentoo.org> |
| 14 |
|
| 15 |
app-emulation/qemu/qemu-7.1.0.ebuild | 9 ++++++--- |
| 16 |
1 file changed, 6 insertions(+), 3 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild b/app-emulation/qemu/qemu-7.1.0.ebuild |
| 19 |
index 0fd301c4946b..c60658cd3590 100644 |
| 20 |
--- a/app-emulation/qemu/qemu-7.1.0.ebuild |
| 21 |
+++ b/app-emulation/qemu/qemu-7.1.0.ebuild |
| 22 |
@@ -590,8 +590,6 @@ qemu_src_configure() { |
| 23 |
$(conf_notuser usbredir usb-redir) |
| 24 |
$(conf_notuser vde) |
| 25 |
$(conf_notuser vhost-net) |
| 26 |
- # $(conf_notuser vhost-user-fs) |
| 27 |
- # $(conf_tools vhost-user-fs virtiofsd) |
| 28 |
$(conf_notuser virgl virglrenderer) |
| 29 |
$(conf_softmmu virtfs) |
| 30 |
$(conf_notuser vnc) |
| 31 |
@@ -624,6 +622,7 @@ qemu_src_configure() { |
| 32 |
conf_opts+=( |
| 33 |
--enable-linux-user |
| 34 |
--disable-system |
| 35 |
+ --disable-blobs |
| 36 |
--disable-tools |
| 37 |
) |
| 38 |
local static_flag="static-user" |
| 39 |
@@ -632,7 +631,6 @@ qemu_src_configure() { |
| 40 |
conf_opts+=( |
| 41 |
--disable-linux-user |
| 42 |
--enable-system |
| 43 |
- --disable-blobs |
| 44 |
--disable-tools |
| 45 |
) |
| 46 |
local static_flag="static" |
| 47 |
@@ -698,6 +696,11 @@ src_configure() { |
| 48 |
softmmu_targets+=",${target}-softmmu" |
| 49 |
softmmu_bins+=( "qemu-system-${target}" ) |
| 50 |
|
| 51 |
+ # Needed to rework vhost-user-fs handling thanks to https://gitlab.com/qemu-project/qemu/-/commit/5166dab |
| 52 |
+ # The option was converted into being configurable by |
| 53 |
+ # Kconfig's. So, to enable it, we insert the necessary |
| 54 |
+ # options into each arch's softmmu target gentoo.mak file, |
| 55 |
+ # then configure with --with-devices-${target}=gentoo. |
| 56 |
if use vhost-user-fs; then |
| 57 |
echo "CONFIG_VHOST_USER_FS=y for ${target}-softmmu" || die |
| 58 |
echo "CONFIG_VIRTIO=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die |
Archives