[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] virtiofsd: Allow to build it without the tools
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 1/6] virtiofsd: Allow to build it without the tools |
Date: |
Tue, 16 Feb 2021 18:37:29 +0000 |
From: Wainer dos Santos Moschetta <wainersm@redhat.com>
This changed the Meson build script to allow virtiofsd be built even
though the tools build is disabled, thus honoring the --enable-virtiofsd
option.
Fixes: cece116c939d219070b250338439c2d16f94e3da (configure: add option for
virtiofsd)
Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Message-Id: <20210201211456.1133364-2-wainersm@redhat.com>
Reviewed-by: Misono Tomohiro <misono.tomohiro@jp.fujitsu.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/meson.build | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/meson.build b/tools/meson.build
index fdce66857d..3e5a0abfa2 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -10,8 +10,11 @@ if get_option('virtiofsd').enabled()
error('virtiofsd requires Linux')
elif not seccomp.found() or not libcap_ng.found()
error('virtiofsd requires libcap-ng-devel and seccomp-devel')
- elif not have_tools or 'CONFIG_VHOST_USER' not in config_host
- error('virtiofsd needs tools and vhost-user support')
+ elif 'CONFIG_VHOST_USER' not in config_host
+ error('virtiofsd needs vhost-user support')
+ else
+ # Disabled all the tools but virtiofsd.
+ have_virtiofsd = true
endif
endif
elif get_option('virtiofsd').disabled() or not have_system
--
2.29.2
- [PULL 0/6] virtiofs queue, Dr. David Alan Gilbert (git), 2021/02/16
- [PULL 1/6] virtiofsd: Allow to build it without the tools,
Dr. David Alan Gilbert (git) <=
- [PULL 2/6] virtiofsd: vu_dispatch locking should never fail, Dr. David Alan Gilbert (git), 2021/02/16
- [PULL 4/6] virtiofsd: Save error code early at the failure callsite, Dr. David Alan Gilbert (git), 2021/02/16
- [PULL 3/6] tools/virtiofsd: Replace the word 'whitelist', Dr. David Alan Gilbert (git), 2021/02/16
- [PULL 5/6] viriofsd: Add support for FUSE_HANDLE_KILLPRIV_V2, Dr. David Alan Gilbert (git), 2021/02/16
- [PULL 6/6] virtiofsd: Do not use a thread pool by default, Dr. David Alan Gilbert (git), 2021/02/16
- Re: [PULL 0/6] virtiofs queue, Peter Maydell, 2021/02/17