[gentoo-commits] repo/gentoo:master commit in: app-emulation/virtiofsd/

["Sam James" <sam@gentoo.org>]

commit:     0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Thu Jul 27 10:08:48 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <michal.privoznik <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32062
Signed-off-by: Sam James <sam <AT> 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
 	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
 	# smaller number means higher priority, but that's probably what users want

diff --git a/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.6.1-r1.ebuild
similarity index 97%
rename from app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
rename to app-emulation/virtiofsd/virtiofsd-1.6.1-r1.ebuild
index bd8fc8dcbfe7..c3d0af907834 100644
--- a/app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-1.6.1-r1.ebuild
@@ -130,6 +130,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
 	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
 	# smaller number means higher priority, but that's probably what users want

diff --git a/app-emulation/virtiofsd/virtiofsd-9999.ebuild b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
index bd8fc8dcbfe7..c3d0af907834 100644
--- a/app-emulation/virtiofsd/virtiofsd-9999.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
@@ -130,6 +130,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
 	# <app-emulation/qemu-8.0.0 install it under different name. In this case,
 	# smaller number means higher priority, but that's probably what users want