From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 665A815808B for ; Mon, 4 Apr 2022 18:44:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A6297E0864; Mon, 4 Apr 2022 18:44:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 1559DE0864 for ; Mon, 4 Apr 2022 18:44:49 +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 AE47F3412A0 for ; Mon, 4 Apr 2022 18:44:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 30BA02B0 for ; Mon, 4 Apr 2022 18:44:47 +0000 (UTC) From: "John Helmert III" 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" Message-ID: <1649097874.991a095934c0cf12cc9aa4420a67a321b1d4e9a2.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/, app-emulation/qemu/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ app-emulation/qemu/files/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: 991a095934c0cf12cc9aa4420a67a321b1d4e9a2 X-VCS-Branch: master Date: Mon, 4 Apr 2022 18:44:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4bf28946-fd35-4bfe-9ee6-f9006604ac18 X-Archives-Hash: 2f5a5e35fc9189c3aeb0b70a46511ded commit: 991a095934c0cf12cc9aa4420a67a321b1d4e9a2 Author: Michal Privoznik redhat com> AuthorDate: Mon Apr 4 11:08:12 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Mon Apr 4 18:44:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991a0959 app-emulation/qemu: Rebase qemu-6.2.0-also-build-virtfs-proxy-helper.patch for live ebuild Since the upstream moved some stuff in meson.build the original patch applies no more. Rebase it onto current master. Signed-off-by: Michal Privoznik redhat.com> Closes: https://github.com/gentoo/gentoo/pull/24898 Signed-off-by: John Helmert III gentoo.org> ...qemu-7.0.0-also-build-virtfs-proxy-helper.patch | 32 ++++++++++++++++++++++ app-emulation/qemu/qemu-9999.ebuild | 2 +- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch new file mode 100644 index 000000000000..ca2e9433792c --- /dev/null +++ b/app-emulation/qemu/files/qemu-7.0.0-also-build-virtfs-proxy-helper.patch @@ -0,0 +1,32 @@ +From c1093041466772f4b62961bcc5a354801d41355d Mon Sep 17 00:00:00 2001 +From: Matthias Maier +Date: Mon, 4 Apr 2022 12:56:59 +0200 +Subject: [PATCH] also build virtfs-proxy-helper + +The Gentoo ebuild splits the qemu build into a softmmu, user and tool +phase in order to be able to build and link some of the qemu emulators +statically. This unfortunately has the consequence that we never +configure with "have_virtfs" and "have_tools" at the same time. + +As a workaround, simply build the virtfs userland unconditionally. After +all, it is a tiny executable +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 861de93c4f..a8d29be3aa 100644 +--- a/meson.build ++++ b/meson.build +@@ -1474,7 +1474,7 @@ have_virtfs = get_option('virtfs') \ + .disable_auto_if(not have_tools and not have_system) \ + .allowed() + +-have_virtfs_proxy_helper = targetos != 'darwin' and have_virtfs and have_tools ++have_virtfs_proxy_helper = have_tools and libattr.found() and libcap_ng.found() + + foreach k : get_option('trace_backends') + config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true) +-- +2.35.1 + diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 13179f417b18..a8468dde1909 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -276,7 +276,7 @@ PATCHES=( "${FILESDIR}"/${PN}-5.2.0-disable-keymap.patch "${FILESDIR}"/${PN}-6.0.0-make.patch "${FILESDIR}"/${PN}-6.1.0-strings.patch - "${FILESDIR}"/${PN}-6.2.0-also-build-virtfs-proxy-helper.patch + "${FILESDIR}"/${PN}-7.0.0-also-build-virtfs-proxy-helper.patch ) QA_PREBUILT="