From 224c50f4204a35f9c4bf42fcd71bb8658202ff71 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Wed, 3 Mar 2021 17:39:52 -0300 Subject: [PATCH] snap: Package virtiofsd and fix path This contain to fixes for the virtiofsd on snap: * removed the "-/usr/libexec" so that virtiofsd is copied to prime * The configuration.toml expects virtiofsd in /usr/libexec/kata-qemu so it should be passed "kata-qemu" to configure_hypervisor.sh script and it wil configure to install the executable onto the right directory. Fixes #1238 Depends-on: github.com/kata-containers/kata-containers#1349 Signed-off-by: Wainer dos Santos Moschetta --- snap/snapcraft.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 10f0a68fb..42277b96b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -278,7 +278,7 @@ parts: chmod +x ${configure_hypervisor} # static build. The --prefix, --libdir, --libexecdir, --datadir arguments are # based on PREFIX and set by configure-hypervisor.sh - echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s qemu) \ + echo "$(PREFIX=/snap/${SNAPCRAFT_PROJECT_NAME}/current/usr ${configure_hypervisor} -s kata-qemu) \ --disable-rbd " \ | xargs ./configure @@ -294,7 +294,6 @@ parts: - -usr/bin/qemu-pr-helper - -usr/bin/virtfs-proxy-helper - -usr/include/ - - -usr/libexec/ - -usr/share/applications/ - -usr/share/icons/ - -usr/var/