|
 |
27bd1bd |
From 9c27ced1fac191139a131d179a25801ce9ca3357 Mon Sep 17 00:00:00 2001
|
|
|
27bd1bd |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
27bd1bd |
Date: Wed, 26 Jul 2017 14:11:15 -0400
|
|
|
27bd1bd |
Subject: [PATCH] meson: -D remote and -D importd should be "combo" options
|
|
|
27bd1bd |
|
|
|
27bd1bd |
The default should be 'auto', and we allow 'true'
|
|
|
27bd1bd |
and 'false' too.
|
|
|
27bd1bd |
|
|
|
27bd1bd |
Fixes #6445.
|
|
|
27bd1bd |
|
|
|
27bd1bd |
(cherry picked from commit b1519d656691e725a8b8950fc0e6cc8d25b1016a)
|
|
|
27bd1bd |
---
|
|
|
27bd1bd |
meson_options.txt | 4 ++--
|
|
|
27bd1bd |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
27bd1bd |
|
|
|
27bd1bd |
diff --git a/meson_options.txt b/meson_options.txt
|
|
|
27bd1bd |
index 1594fec41f..b7a45d5806 100644
|
|
|
27bd1bd |
--- a/meson_options.txt
|
|
|
27bd1bd |
+++ b/meson_options.txt
|
|
|
27bd1bd |
@@ -69,7 +69,7 @@ option('timedated', type : 'boolean',
|
|
|
27bd1bd |
description : 'install the systemd-timedated daemon')
|
|
|
27bd1bd |
option('timesyncd', type : 'boolean',
|
|
|
27bd1bd |
description : 'install the systemd-timesyncd daemon')
|
|
|
27bd1bd |
-option('remote', type : 'boolean',
|
|
|
27bd1bd |
+option('remote', type : 'combo', choices : ['auto', 'true', 'false'],
|
|
|
27bd1bd |
description : 'support for "journal over the network"')
|
|
|
27bd1bd |
option('myhostname', type : 'boolean',
|
|
|
27bd1bd |
description : 'nss-myhostname support')
|
|
|
27bd1bd |
@@ -87,7 +87,7 @@ option('sysusers', type : 'boolean',
|
|
|
27bd1bd |
description : 'support for the sysusers configuration')
|
|
|
27bd1bd |
option('tmpfiles', type : 'boolean',
|
|
|
27bd1bd |
description : 'support for tmpfiles.d')
|
|
|
27bd1bd |
-option('importd', type : 'boolean',
|
|
|
27bd1bd |
+option('importd', type : 'combo', choices : ['auto', 'true', 'false'],
|
|
|
27bd1bd |
description : 'install the systemd-importd daemon')
|
|
|
27bd1bd |
option('hwdb', type : 'boolean',
|
|
|
27bd1bd |
description : 'support for the hardware database')
|