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

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

commit:     cd59e8c8dc76f8021aebaa6d7b776c5858358eab
Author:     Michal Privoznik <michal.privoznik <AT> gmail <DOT> com>
AuthorDate: Thu Jun 29 14:37:35 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  2 22:32:56 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd59e8c8

app-emulation/virtiofsd: Install 50-qemu-virtiofsd.json

With the old virtiofsd provided by app-emulation/qemu the
corresponding JSON file descriptor is installed by QEMU. But with
this new rust version, we have to install it ourselves in order
for libvirt to pick it up. To avoid conflicts with the file
installed by app-emulation/qemu we can install it under a
different name. And because smaller number means higher priority
let's go with "40-qemu-virtiofsd.json" so that users with
<app-emulation/qemu-8.0.0 can benefit from rust version of the
daemon (if both are installed).

Closes: https://bugs.gentoo.org/909372
Signed-off-by: Michal Privoznik <michal.privoznik <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../{virtiofsd-1.5.1.ebuild => virtiofsd-1.5.1-r1.ebuild}    | 12 ++++++++++++
 app-emulation/virtiofsd/virtiofsd-9999.ebuild                | 12 ++++++++++++
 2 files changed, 24 insertions(+)

diff --git a/app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild b/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild
similarity index 84%
rename from app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild
rename to app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild
index 3352892e3b9a..a609ac7791fa 100644
--- a/app-emulation/virtiofsd/virtiofsd-1.5.1.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild
@@ -124,3 +124,15 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_install() {
+	cargo_src_install
+
+	# 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
+	# anyway if they install this package on top of app-emulation/qemu.
+	# TODO: remove once old QEMUs are removed from the portage.
+	insinto "/usr/share/qemu/vhost-user"
+	newins "50-qemu-virtiofsd.json" "40-qemu-virtiofsd.json"
+}

diff --git a/app-emulation/virtiofsd/virtiofsd-9999.ebuild b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
index 3352892e3b9a..a609ac7791fa 100644
--- a/app-emulation/virtiofsd/virtiofsd-9999.ebuild
+++ b/app-emulation/virtiofsd/virtiofsd-9999.ebuild
@@ -124,3 +124,15 @@ src_unpack() {
 		cargo_src_unpack
 	fi
 }
+
+src_install() {
+	cargo_src_install
+
+	# 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
+	# anyway if they install this package on top of app-emulation/qemu.
+	# TODO: remove once old QEMUs are removed from the portage.
+	insinto "/usr/share/qemu/vhost-user"
+	newins "50-qemu-virtiofsd.json" "40-qemu-virtiofsd.json"
+}