[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 05/92] meson: error out if qemu_suffix starts with /
From: |
Paolo Bonzini |
Subject: |
[PULL 05/92] meson: error out if qemu_suffix starts with / |
Date: |
Thu, 24 Sep 2020 05:21:47 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Since the variable is used for path concatenation, the result would
ignore the prefix directory altogether.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
meson.build | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/meson.build b/meson.build
index f4d1ab1096..bb4259e7f0 100644
--- a/meson.build
+++ b/meson.build
@@ -17,6 +17,11 @@ config_host = keyval.load(meson.current_build_dir() /
'config-host.mak')
enable_modules = 'CONFIG_MODULES' in config_host
enable_static = 'CONFIG_STATIC' in config_host
build_docs = 'BUILD_DOCS' in config_host
+
+if get_option('qemu_suffix').startswith('/')
+ error('qemu_suffix cannot start with a /')
+endif
+
qemu_datadir = get_option('datadir') / get_option('qemu_suffix')
qemu_docdir = get_option('docdir') / get_option('qemu_suffix')
config_host_data = configuration_data()
--
2.26.2
- [PULL 00/92] Misc patches for 2020-09-24, Paolo Bonzini, 2020/09/24
- [PULL 02/92] meson: clean up build_by_default, Paolo Bonzini, 2020/09/24
- [PULL 03/92] ninjatool: rebuild multi-output targets if outputs are missing, Paolo Bonzini, 2020/09/24
- [PULL 01/92] tests: add missing genh dependency, Paolo Bonzini, 2020/09/24
- [PULL 05/92] meson: error out if qemu_suffix starts with /,
Paolo Bonzini <=
- [PULL 04/92] meson: fix MSI rule, Paolo Bonzini, 2020/09/24
- [PULL 07/92] configure: Do not intent to build WHPX on 32-bit host, Paolo Bonzini, 2020/09/24
- [PULL 06/92] WHPX: vmware cpuid leaf for tsc and apic frequency, Paolo Bonzini, 2020/09/24
- [PULL 08/92] MAINTAINERS: add Paolo Bonzini as RCU maintainer, Paolo Bonzini, 2020/09/24
- [PULL 09/92] target/i386: support KVM_FEATURE_ASYNC_PF_INT, Paolo Bonzini, 2020/09/24
- [PULL 10/92] memory: Convert IOMMUMemoryRegionClass doc comment to kernel-doc, Paolo Bonzini, 2020/09/24
- [PULL 15/92] numa: remove fixup numa_state->num_nodes to MAX_NODES, Paolo Bonzini, 2020/09/24
- [PULL 12/92] acpi: i386: Move VMBus DSDT entry to SB, Paolo Bonzini, 2020/09/24
- [PULL 11/92] vhost-scsi: support inflight io track, Paolo Bonzini, 2020/09/24
- [PULL 14/92] doc: Cleanup "'-mem-path' fallback to RAM" deprecation text, Paolo Bonzini, 2020/09/24