summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Privoznik <michal.privoznik@gmail.com>2023-07-27 12:08:48 +0200
committerSam James <sam@gentoo.org>2023-07-27 13:00:29 +0100
commit0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed (patch)
tree966c2f7a208bf91c62fa0c51fb6d244c9525ecf0 /app-emulation/virtiofsd
parentnet-misc/sslh: build with LFS (diff)
downloadgentoo-0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed.tar.gz
gentoo-0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed.tar.bz2
gentoo-0a38ac0e9f9f4f6b7c0f8fbca13b6ae9256ad6ed.zip
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@gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32062 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'app-emulation/virtiofsd')
-rw-r--r--app-emulation/virtiofsd/virtiofsd-1.5.1-r2.ebuild (renamed from app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild)3
-rw-r--r--app-emulation/virtiofsd/virtiofsd-1.6.1-r1.ebuild (renamed from app-emulation/virtiofsd/virtiofsd-1.6.1.ebuild)3
-rw-r--r--app-emulation/virtiofsd/virtiofsd-9999.ebuild3
3 files changed, 9 insertions, 0 deletions
diff --git a/app-emulation/virtiofsd/virtiofsd-1.5.1-r1.ebuild b/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
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