meson: add feature flag for validatefs

validatefs builds and installs binaries, docs, units, etc. Add a
feature flag to make it easier to avoid shipping it.

man/rules/meson.build

@@ -1376,7 +1376,7 @@ manpages = [
  ['systemd-update-utmp.service', '8', ['systemd-update-utmp'], 'ENABLE_UTMP'],
  ['systemd-user-sessions.service', '8', ['systemd-user-sessions'], 'HAVE_PAM'],
  ['systemd-userdbd.service', '8', ['systemd-userdbd'], 'ENABLE_USERDB'],
- ['systemd-validatefs@.service', '8', [], 'HAVE_BLKID'],
+ ['systemd-validatefs@.service', '8', [], 'ENABLE_VALIDATEFS'],
  ['systemd-vconsole-setup.service',
   '8',
   ['systemd-vconsole-setup'],

man/systemd-validatefs@.service.xml

@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="systemd-validatefs_.service" conditional='HAVE_BLKID'
+<refentry id="systemd-validatefs_.service" conditional='ENABLE_VALIDATEFS'
           xmlns:xi="http://www.w3.org/2001/XInclude">
 
   <refentryinfo>

meson.build

@@ -1804,6 +1804,11 @@ have = get_option('integritysetup').require(
         error_message : 'libcryptsetup required for systemd-integritysetup').allowed()
 conf.set10('ENABLE_INTEGRITYSETUP', have)
 
+have = get_option('validatefs').require(
+        conf.get('HAVE_BLKID') == 1,
+        error_message : 'blkid required for systemd-validatefs').allowed()
+conf.set10('ENABLE_VALIDATEFS', have)
+
 foreach tuple : [
                 ['analyze'],
                 ['backlight'],
@@ -3499,6 +3504,7 @@ foreach tuple : [
         ['timesyncd'],
         ['tmpfiles'],
         ['userdb'],
+        ['validatefs'],
         ['vconsole'],
         ['vmspawn'],
         ['xdg-autostart'],

meson_options.txt

@@ -282,6 +282,8 @@ option('ukify', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : '
        description : 'install ukify')
 option('utmp', type : 'boolean',
        description : 'support for utmp/wtmp log handling')
+option('validatefs', type : 'feature',
+       description : 'install systemd-validatefs and associated files')
 option('varlink-monitord', type : 'boolean',
        description : 'install the systemd-varlink-monitord daemon')
 option('vconsole', type : 'boolean',

src/validatefs/meson.build

@@ -4,7 +4,7 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-validatefs',
                 'conditions' : [
-                        'HAVE_BLKID',
+                        'ENABLE_VALIDATEFS',
                 ],
                 'sources' : files('validatefs.c'),
                 'dependencies' : [

units/meson.build

@@ -1157,7 +1157,7 @@ units = [
         },
         {
           'file' : 'systemd-validatefs@.service.in',
-          'conditions' : ['HAVE_BLKID'],
+          'conditions' : ['ENABLE_VALIDATEFS'],
         },
         {
           'file' : 'systemd-varlink-monitord.socket',