commit: d1ccaba75b064ef53978062df4edd341cb752405
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 22:35:12 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Sep 27 03:26:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1ccaba7
app-emulation/qemu: --disable-blobs for user builds, not for softmmu
Also add a comment explaining new vhost-user-fs logic while here, and
clean up dead and commented configure arguments.
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
app-emulation/qemu/qemu-7.1.0.ebuild | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/app-emulation/qemu/qemu-7.1.0.ebuild
b/app-emulation/qemu/qemu-7.1.0.ebuild
index 0fd301c4946b..c60658cd3590 100644
--- a/app-emulation/qemu/qemu-7.1.0.ebuild
+++ b/app-emulation/qemu/qemu-7.1.0.ebuild
@@ -590,8 +590,6 @@ qemu_src_configure() {
$(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)
@@ -624,6 +622,7 @@ qemu_src_configure() {
conf_opts+=(
--enable-linux-user
--disable-system
+ --disable-blobs
--disable-tools
)
local static_flag="static-user"
@@ -632,7 +631,6 @@ qemu_src_configure() {
conf_opts+=(
--disable-linux-user
--enable-system
- --disable-blobs
--disable-tools
)
local static_flag="static"
@@ -698,6 +696,11 @@ src_configure() {
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
+ # Needed to rework vhost-user-fs handling thanks to
https://gitlab.com/qemu-project/qemu/-/commit/5166dab
+ # The option was converted into being configurable by
+ # Kconfig's. So, to enable it, we insert the necessary
+ # options into each arch's softmmu target gentoo.mak
file,
+ # then configure with --with-devices-${target}=gentoo.
if use vhost-user-fs; then
echo "CONFIG_VHOST_USER_FS=y for
${target}-softmmu" || die
echo "CONFIG_VIRTIO=y" >>
"configs/devices/${target}-softmmu/gentoo.mak" || die
