From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1459190-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6EA72158020
for <garchives@archives.gentoo.org>; Tue, 22 Nov 2022 06:20:48 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id BA12BE0CD4;
Tue, 22 Nov 2022 06:20:47 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A1DEEE0CD4
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 06:20:47 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id B46FC34106D
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 06:20:46 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 55977731
for <gentoo-commits@lists.gentoo.org>; Tue, 22 Nov 2022 06:20:45 +0000 (UTC)
From: "John Helmert III" <ajak@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" <ajak@gentoo.org>
Message-ID: <1669098029.dacf2f8b487b4e9fbbe356ada9b77847ee24aa66.ajak@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild app-emulation/qemu/qemu-7.2.0_rc1.ebuild
X-VCS-Directories: app-emulation/qemu/
X-VCS-Committer: ajak
X-VCS-Committer-Name: John Helmert III
X-VCS-Revision: dacf2f8b487b4e9fbbe356ada9b77847ee24aa66
X-VCS-Branch: master
Date: Tue, 22 Nov 2022 06:20:45 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1b1173f5-26ff-4dcc-a7a3-5113c0632795
X-Archives-Hash: 7fa13a7dc2534d2f18e97190a67fff94
commit: dacf2f8b487b4e9fbbe356ada9b77847ee24aa66
Author: John Helmert III <ajak <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 06:17:48 2022 +0000
Commit: John Helmert III <ajak <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 06:20:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dacf2f8b
app-emulation/qemu: force on vhost-user-fs
Bug: https://bugs.gentoo.org/873190
Signed-off-by: John Helmert III <ajak <AT> gentoo.org>
...u-7.2.0_rc1.ebuild => qemu-7.2.0_rc1-r1.ebuild} | 31 +++-------------------
1 file changed, 3 insertions(+), 28 deletions(-)
diff --git a/app-emulation/qemu/qemu-7.2.0_rc1.ebuild b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
similarity index 95%
rename from app-emulation/qemu/qemu-7.2.0_rc1.ebuild
rename to app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
index ae0ca6960545..55f7d11a7162 100644
--- a/app-emulation/qemu/qemu-7.2.0_rc1.ebuild
+++ b/app-emulation/qemu/qemu-7.2.0_rc1-r1.ebuild
@@ -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