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 A8B41158083 for ; Thu, 26 Sep 2024 06:14:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B7357E2A2F; Thu, 26 Sep 2024 06:14:36 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9C3A5E2A30 for ; Thu, 26 Sep 2024 06:14:36 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9758C3431BA for ; Thu, 26 Sep 2024 06:14:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AAE71F46 for ; Thu, 26 Sep 2024 06:14:33 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1727331205.ee6fb718f41c559c7bc00b531894e2849837ee6a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/qemu/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/qemu/qemu-9999.ebuild X-VCS-Directories: app-emulation/qemu/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: ee6fb718f41c559c7bc00b531894e2849837ee6a X-VCS-Branch: master Date: Thu, 26 Sep 2024 06:14:33 +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: 8aedf5db-5903-4371-837d-95bd08e364ec X-Archives-Hash: 87db40d77d38a93e392a9b7130994866 commit: ee6fb718f41c559c7bc00b531894e2849837ee6a Author: Christopher Fore posteo net> AuthorDate: Wed Sep 25 12:19:46 2024 +0000 Commit: Sam James gentoo org> CommitDate: Thu Sep 26 06:13:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee6fb718 app-emulation/qemu: Add xdp USE flag to live ebuild This will add an xdp USE flag to fix situations where users have the bpf USE flag disabled but libxdp is installed thru net-libs/xdp-tools. This results in QEMU automatically detecting this and attempting to build af-xdp and failing. Credit-to: holgerh, parona Bug: https://bugs.gentoo.org/920459 Signed-off-by: Christopher Fore posteo.net> Closes: https://github.com/gentoo/gentoo/pull/35197 Signed-off-by: Sam James gentoo.org> app-emulation/qemu/qemu-9999.ebuild | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app-emulation/qemu/qemu-9999.ebuild b/app-emulation/qemu/qemu-9999.ebuild index 978471403537..c959ff18faaf 100644 --- a/app-emulation/qemu/qemu-9999.ebuild +++ b/app-emulation/qemu/qemu-9999.ebuild @@ -66,7 +66,7 @@ IUSE="accessibility +aio alsa bpf bzip2 capstone +curl debug ${QEMU_DOC_USEFLAG} plugins +png pulseaudio python rbd sasl +seccomp sdl sdl-image selinux +slirp smartcard snappy spice ssh static-user systemtap test udev usb - usbredir vde +vhost-net virgl virtfs +vnc vte xattr xen + usbredir vde +vhost-net virgl virtfs +vnc vte xattr xdp xen zstd" COMMON_TARGETS=" @@ -141,6 +141,7 @@ REQUIRED_USE=" vte? ( gtk ) multipath? ( udev ) plugins? ( !static-user ) + xdp? ( bpf ) " for smname in ${IUSE_SOFTMMU_TARGETS} ; do REQUIRED_USE+=" qemu_softmmu_targets_${smname}? ( kernel_linux? ( seccomp ) )" @@ -235,6 +236,7 @@ SOFTMMU_TOOLS_DEPEND=" vde? ( net-misc/vde[static-libs(+)] ) virgl? ( media-libs/virglrenderer[static-libs(+)] ) virtfs? ( sys-libs/libcap ) + xdp? ( net-libs/xdp-tools ) xen? ( app-emulation/xen-tools:= ) zstd? ( >=app-arch/zstd-1.4.0[static-libs(+)] ) " @@ -633,6 +635,7 @@ qemu_src_configure() { $(conf_softmmu virtfs) $(conf_notuser vnc) $(conf_notuser vte) + $(conf_softmmu xdp af-xdp) $(conf_notuser xen) $(conf_notuser xen xen-pci-passthrough) # use prebuilt keymaps, bug #759604