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