diff options
| author | Wainer dos Santos Moschetta <wainersm@redhat.com> | 2021-02-01 18:14:56 -0300 |
|---|---|---|
| committer | Dr. David Alan Gilbert <dgilbert@redhat.com> | 2021-02-16 17:03:09 +0000 |
| commit | 0958ee89b6fb8542867ca68203626d6aef522e8f (patch) | |
| tree | 94c3da0a3ffbb0481b21c5595c8404bc4005bbae | |
| parent | 18543229fd7a2c79dcd6818c7b1f0f62512b5220 (diff) | |
| download | focaccia-qemu-0958ee89b6fb8542867ca68203626d6aef522e8f.tar.gz focaccia-qemu-0958ee89b6fb8542867ca68203626d6aef522e8f.zip | |
virtiofsd: Allow to build it without the tools
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>
| -rw-r--r-- | tools/meson.build | 7 |
1 files 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 |