mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-21 22:47:14 -08:00
app-emulation/qemu: force on vhost-user-fs
Bug: https://bugs.gentoo.org/873190 Signed-off-by: John Helmert III <ajak@gentoo.org>
This commit is contained in:
+3
-28
@@ -60,7 +60,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +caps +curl debug ${QEMU_DOC_US
|
||||
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
|
||||
usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen
|
||||
zstd"
|
||||
|
||||
COMMON_TARGETS="
|
||||
@@ -117,7 +117,8 @@ 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}
|
||||
REQUIRED_USE="caps seccomp
|
||||
${PYTHON_REQUIRED_USE}
|
||||
qemu_softmmu_targets_arm? ( fdt )
|
||||
qemu_softmmu_targets_microblaze? ( fdt )
|
||||
qemu_softmmu_targets_mips64el? ( fdt )
|
||||
@@ -129,7 +130,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
|
||||
sdl-image? ( sdl )
|
||||
static? ( static-user !alsa !gtk !jack !opengl !pam !pulseaudio !plugins !rbd !snappy !udev )
|
||||
static-user? ( !plugins )
|
||||
vhost-user-fs? ( caps seccomp )
|
||||
virgl? ( opengl )
|
||||
virtfs? ( caps xattr )
|
||||
vnc? ( gnutls )
|
||||
@@ -636,16 +636,6 @@ qemu_src_configure() {
|
||||
--disable-tools
|
||||
)
|
||||
local static_flag="static"
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS}; do
|
||||
if use "qemu_softmmu_targets_${target}"; then
|
||||
conf_opts+=(
|
||||
# For some reason, adding this with the setting set
|
||||
# to on *or* off makes the build always fail.
|
||||
# --with-devices-${target}=gentoo
|
||||
)
|
||||
fi
|
||||
done
|
||||
;;
|
||||
tools)
|
||||
conf_opts+=(
|
||||
@@ -697,21 +687,6 @@ src_configure() {
|
||||
if use "qemu_softmmu_targets_${target}"; then
|
||||
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
|
||||
echo "CONFIG_VHOST_USER_FS=y" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
|
||||
else
|
||||
echo "CONFIG_VHOST_USER_FS=n for ${target}-softmmu" || die
|
||||
echo "CONFIG_VIRTIO=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
|
||||
echo "CONFIG_VHOST_USER_FS=n" >> "configs/devices/${target}-softmmu/gentoo.mak" || die
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user