Merging upstream version 2.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 71 insertions, 11 deletions

diff --git a/meson_options.txt b/meson_options.txt
index 677942a..c61dae0 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,12 +1,72 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
-option('version-tag', type : 'string', description : 'override the git version string')
-option('udevrulesdir', type : 'string', value : 'lib/udev/rules.d', description : 'directory for udev rules files')
-option('dracutrulesdir', type : 'string', value : 'lib/dracut/dracut.conf.d/', description : 'directory for dracut rules files')
-option('systemddir', type : 'string', value : 'lib/systemd/system', description : 'directory for systemd files')
-option('htmldir', type : 'string', value : '', description : 'directory for HTML documentation')
-option('systemctl', type : 'string', value : '/usr/bin/systemctl', description : 'path to systemctl binary')
-option('nvme-tests', type : 'boolean', value : false, description: 'Run tests against real hardware')
-option('docs', type : 'combo', choices : ['false', 'html', 'man', 'all'], description : 'install documentation')
-option('docs-build', type : 'boolean', value : false, description : 'build documentation')
-option('pdc-enabled', type: 'boolean', value : false, description : 'set default Persistent Discovery Controllers behavior')
-option('json-c', type: 'feature', value: 'auto', description: 'JSON suppport')
+option(
+  'docs',
+  type : 'combo',
+  choices : ['false', 'html', 'man', 'all'],
+  description : 'install documentation'
+)
+option(
+  'docs-build',
+  type : 'boolean',
+  value : false,
+  description : 'build documentation'
+)
+option(
+  'dracutrulesdir',
+  type : 'string',
+  value : 'lib/dracut/dracut.conf.d/',
+  description : 'directory for dracut rules files'
+)
+option(
+  'htmldir',
+  type : 'string',
+  value : '',
+  description : 'directory for HTML documentation'
+)
+option(
+  'json-c',
+  type: 'feature',
+  value: 'auto',
+  description: 'JSON suppport'
+)
+option(
+  'nvme-tests',
+  type : 'boolean',
+  value : false,
+  description: 'Run tests against real hardware'
+)
+option(
+  'pdc-enabled',
+  type: 'boolean',
+  value : false,
+  description : 'set default Persistent Discovery Controllers behavior'
+)
+option(
+  'rundir',
+  type: 'string',
+  value: 'run',
+  description: 'directory for volatile configuration files',
+)
+option(
+  'systemctl',
+  type : 'string',
+  value : '/usr/bin/systemctl',
+  description : 'path to systemctl binary'
+)
+option(
+  'systemddir',
+  type : 'string',
+  value : 'lib/systemd/system',
+  description : 'directory for systemd files'
+)
+option(
+  'udevrulesdir',
+  type : 'string',
+  value : 'lib/udev/rules.d',
+  description : 'directory for udev rules files'
+)
+option(
+  'version-tag',
+  type : 'string',
+  description : 'override the git version string'
+)