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 DBF4C15800A for ; Thu, 27 Jul 2023 12:00:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E8F2E0928; Thu, 27 Jul 2023 12:00:57 +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 199B5E0928 for ; Thu, 27 Jul 2023 12:00:57 +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 4600734147F for ; Thu, 27 Jul 2023 12:00:56 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5FE6DC7 for ; Thu, 27 Jul 2023 12:00:54 +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: <1690459229.0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/virtiofsd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild app-emulation/virtiofsd/virtiofsd-1.5.1-r2.ebuild app-emulation/virtiofsd/virtiofsd-1.6.1-r1.ebuild app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild app-emulation/virtiofsd/virtiofsd-9999.ebuild X-VCS-Directories: app-emulation/virtiofsd/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed X-VCS-Branch: master Date: Thu, 27 Jul 2023 12:00:54 +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: ad1e4f81-2c4a-4871-88fe-de3b0d242ec0 X-Archives-Hash: 7c0c88cb4b2c04966c27f5dc4fe8268e commit: 0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed Author: Michal Privoznik gmail com> AuthorDate: Thu Jul 27 10:08:48 2023 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jul 27 12:00:29 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a38ac0e app-emulation/virtiofsd: Move virtiofsd binary into /usr/libexec In one of my recent commits I've introduced JSON descriptor file that libvirt uses when learning about helper binaries (40-qemu-virtiofsd.json). What I did not realize is that the file tells libvirt to execute /usr/libexec/virtiofsd while our ebuilds install the binary under /usr/bin/. I haven't found a way to tell cargo_src_install where to install the binary so we have to move it 'manually'. Bug: https://bugs.gentoo.org/909372 Closes: https://bugs.gentoo.org/911274 Signed-off-by: Michal Privoznik gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32062 Signed-off-by: Sam James gentoo.org> .../virtiofsd/{virtiofsd-1.5.1-r1.ebuild => virtiofsd-1.5.1-r2.ebuild} | 3 +++ .../virtiofsd/{virtiofsd-1.6.1.ebuild => virtiofsd-1.6.1-r1.ebuild} | 3 +++ app-emulation/virtiofsd/virtiofsd-9999.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.5.1-r2.ebuild similarity index 97% rename from app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild rename to app-emulation/virtiofsd/virtiofsd-1.5.1-r2.ebuild index a609ac7791fa..9b66f0ea8185 100644 --- a/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild +++ b/app-emulation/virtiofsd/virtiofsd-1.5.1-r2.ebuild @@ -128,6 +128,9 @@ src_unpack() { src_install() { cargo_src_install + mkdir "${ED}/usr/libexec" || die + mv "${ED}/usr/"{bin,libexec}/${PN} || die + # Install 50-qemu-virtiofsd.json but to avoid conflicts with #