From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1230735-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id A994D1382C5
for <garchives@archives.gentoo.org>; Sun, 13 Dec 2020 11:47:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 0AB6BE086B;
Sun, 13 Dec 2020 11:47:09 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id E4F2AE086B
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Dec 2020 11:47:08 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F0329340E7F
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Dec 2020 11:47:07 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F8CD4B
for <gentoo-commits@lists.gentoo.org>; Sun, 13 Dec 2020 11:47:06 +0000 (UTC)
From: "Sergei Trofimovich" <slyfox@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, "Sergei Trofimovich" <slyfox@gentoo.org>
Message-ID: <1607859998.cf274423cac2d869f44469c896d22213c537434c.slyfox@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/qemu/qemu-5.2.0-r1.ebuild app-emulation/qemu/qemu-5.2.0.ebuild app-emulation/qemu/qemu-9999.ebuild
X-VCS-Directories: app-emulation/qemu/
X-VCS-Committer: slyfox
X-VCS-Committer-Name: Sergei Trofimovich
X-VCS-Revision: cf274423cac2d869f44469c896d22213c537434c
X-VCS-Branch: master
Date: Sun, 13 Dec 2020 11:47:06 +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: 9f6864b2-594c-4cab-95a3-ccd7469355d8
X-Archives-Hash: 5d76b892ed381641b6e8a9816d6b0472
commit: cf274423cac2d869f44469c896d22213c537434c
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sun Dec 13 03:18:16 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Dec 13 11:46:38 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf274423
app-emulation/qemu: build virtiofsd if USE=vhost-user-fs
With qemu-5.2.0 build system changes, virtiofsd would only be auto-enabled if
USE="caps seccomp", --enable-tools, and --enable-system. The last being
disabled for the tools build led to virtiofsd being missing for users.
Rather than work around, control using --enable-virtiofsd and USE=vhost-user-fs
Cannot be enabled together with --disable-tools, so added conf_tools()
Closes: https://bugs.gentoo.org/759673
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
app-emulation/qemu/{qemu-5.2.0.ebuild => qemu-5.2.0-r1.ebuild} | 10 ++++++++++
app-emulation/qemu/qemu-9999.ebuild | 10 ++++++++++
2 files changed, 20 insertions(+)
diff --git a/app-emulation/qemu/qemu-5.2.0.ebuild b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
similarity index 98%
rename from app-emulation/qemu/qemu-5.2.0.ebuild
rename to app-emulation/qemu/qemu-5.2.0-r1.ebuild
index fb697371ce5..7c4861c024b 100644
--- a/app-emulation/qemu/qemu-5.2.0.ebuild
+++ b/app-emulation/qemu/qemu-5.2.0-r1.ebuild
@@ -69,6 +69,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_riscv64? ( fdt )
static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
static-user? ( !plugins )
+ vhost-user-fs? ( caps seccomp )
virtfs? ( caps xattr )
vte? ( gtk )
plugins? ( !static !static-user )
@@ -439,6 +440,14 @@ qemu_src_configure() {
echo "--disable-${2:-$1}"
fi
}
+ # Enable option only for tools build, but not 'user' or 'softmmu'
+ conf_tools() {
+ if [[ ${buildtype} == "tools" ]] ; then
+ use_enable "$@"
+ else
+ echo "--disable-${2:-$1}"
+ fi
+ }
conf_opts+=(
$(conf_notuser accessibility brlapi)
$(conf_notuser aio linux-aio)
@@ -480,6 +489,7 @@ qemu_src_configure() {
$(conf_notuser vde)
$(conf_notuser vhost-net)
$(conf_notuser vhost-user-fs)
+ $(conf_tools vhost-user-fs virtiofsd)
$(conf_notuser virgl virglrenderer)
$(conf_notuser virtfs)
$(conf_notuser vnc)
diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild
index 381e677e530..ac31c2cc447 100644
--- a/app-emulation/qemu/qemu-9999.ebuild
+++ b/app-emulation/qemu/qemu-9999.ebuild
@@ -69,6 +69,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_riscv64? ( fdt )
static? ( static-user !alsa !gtk !jack !opengl !pulseaudio !plugins !rbd !snappy )
static-user? ( !plugins )
+ vhost-user-fs? ( caps seccomp )
virtfs? ( caps xattr )
vte? ( gtk )
plugins? ( !static !static-user )
@@ -437,6 +438,14 @@ qemu_src_configure() {
echo "--disable-${2:-$1}"
fi
}
+ # Enable option only for tools build, but not 'user' or 'softmmu'
+ conf_tools() {
+ if [[ ${buildtype} == "tools" ]] ; then
+ use_enable "$@"
+ else
+ echo "--disable-${2:-$1}"
+ fi
+ }
conf_opts+=(
$(conf_notuser accessibility brlapi)
$(conf_notuser aio linux-aio)
@@ -478,6 +487,7 @@ qemu_src_configure() {
$(conf_notuser vde)
$(conf_notuser vhost-net)
$(conf_notuser vhost-user-fs)
+ $(conf_tools vhost-user-fs virtiofsd)
$(conf_notuser virgl virglrenderer)
$(conf_notuser virtfs)
$(conf_notuser vnc)