meson: enable vmspawn by default in developer mode

This should also implicitly enabled vmspawn in CI. It wasn't passing even the
basic tests, which we didn't see, because it needs to be explicitly enabled.

diff --git a/meson.build b/meson.build
index 3e68f43ea63c3b07653b523b275efcf34acd19c4..32a181e50d2963cc5754957c5cf7519d4c0b2860 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -33,6 +33,7 @@ conf.set_quoted('RELATIVE_SOURCE_PATH', relative_source_path)
 
 conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
            description : 'tailor build to development or release builds')
+
 feature = get_option('log-message-verification')
 if feature.auto()
         have = conf.get('BUILD_MODE_DEVELOPER') == 1
@@ -1569,6 +1570,9 @@ endif
 have = feature.allowed() and (have_deps[0] or have_deps[1])
 conf.set10('ENABLE_REMOTE', have)
 
+feature = get_option('vmspawn').disable_auto_if(conf.get('BUILD_MODE_DEVELOPER') == 0)
+conf.set10('ENABLE_VMSPAWN', feature.allowed())
+
 foreach term : ['analyze',
                 'backlight',
                 'binfmt',
@@ -1610,7 +1614,6 @@ foreach term : ['analyze',
                 'userdb',
                 'utmp',
                 'vconsole',
-                'vmspawn',
                 'xdg-autostart']
         have = get_option(term)
         name = 'ENABLE_' + term.underscorify().to_upper()

diff --git a/meson_options.txt b/meson_options.txt
index abefa284586a1254badc27e6139043e35c8f0d25..e9283dc37e904490f19ffc096b2995f1730b8f29 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -156,7 +156,7 @@ option('backlight', type : 'boolean',
        description : 'support for restoring backlight state')
 option('vconsole', type : 'boolean',
        description : 'support for vconsole configuration')
-option('vmspawn', type : 'boolean', value: false,
+option('vmspawn', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
        description : 'install the systemd-vmspawn tool')
 option('quotacheck', type : 'boolean',
        description : 'support for the quotacheck tools')