github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-05-01 05:04:26 +00:00
Code Issues Projects Releases Wiki Activity

tools: Stop building virtiofsd with qemu (for x86_64)

Browse Source 
As we finally can move to using the rust virtiofs daemon, let's stop
bulding and packaging the C version of the virtiofsd for x86_64.

Fixes: #4249
Depends-on: github.com/kata-containers/tests#4785

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2022-05-11 21:05:17 +02:00 committed by Samuel Ortiz
parent c39852e83f
commit d1f2852d8b
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/packaging/scripts/configure-hypervisor.sh
View File

@ -322,7 +322,26 @@ generate_qemu_options() {
# But since QEMU 5.2 the daemon is built as part of the tools set # But since QEMU 5.2 the daemon is built as part of the tools set
# (disabled with --disable-tools) thus it needs to be explicitely # (disabled with --disable-tools) thus it needs to be explicitely
# enabled. # enabled.
qemu_options+=(functionality:--enable-virtiofsd) #
# From Kata Containers 2.5.0-alpha2 x86_64 has been using the new
# implementation of virtiofs daemon, which is not part of QEMU.
# For the other arches, at least for now, keep building from while
# building QEMU.
#
# IOW, other arches are still using the C version of the virtiofsd.
case "$arch" in
aarch64)
qemu_options+=(functionality:--enable-virtiofsd)
;;
x86_64)
;;
ppc64le)
qemu_options+=(functionality:--enable-virtiofsd)
;;
s390x)
qemu_options+=(functionality:--enable-virtiofsd)
;;
esac
qemu_options+=(functionality:--enable-virtfs) qemu_options+=(functionality:--enable-virtfs)
# Don't build linux-user bsd-user # Don't build linux-user bsd-user

4
tools/packaging/static-build/scripts/qemu-build-post.sh
View File

@ -26,7 +26,9 @@ done
if [[ -n "${BUILD_SUFFIX}" ]]; then if [[ -n "${BUILD_SUFFIX}" ]]; then
echo "Rename binaries using $BUILD_SUFFIX" echo "Rename binaries using $BUILD_SUFFIX"
find -name 'qemu-system-*' -exec mv {} {}-experimental \; find -name 'qemu-system-*' -exec mv {} {}-experimental \;
find -name 'virtiofsd' -exec mv {} {}-experimental \; if [[ ${ARCH} != "x86_64" ]]; then
find -name 'virtiofsd' -exec mv {} {}-experimental \;
fi
fi fi
echo "INFO: create the tarball" echo "INFO: create the tarball"