meson.build: Fix wron mask ending and some missing trailing whitespaces on mask blocks.

1 files changed, 156 insertions, 156 deletions

diff --git a/meson.build b/meson.build
index 7b0739f98..b8e653298 100644
--- a/meson.build
+++ b/meson.build
@@ -54,7 +54,7 @@ m4_defines = []
 
 #####################################################################
 #if 0 /// elogind does not need this
-#
+# 
 # # Try to install the git pre-commit hook
 # git_hook = run_command(join_paths(meson.source_root(), 'tools/add-git-hook.sh'))
 # if git_hook.returncode() == 0
@@ -181,7 +181,7 @@ modprobedir = join_paths(rootprefixdir, 'lib/modprobe.d')
 # systemdstatedir = join_paths(localstatedir, 'lib/systemd')
 # catalogstatedir = join_paths(systemdstatedir, 'catalog')
 # randomseeddir = join_paths(localstatedir, 'lib/systemd')
-#
+# 
 # docdir = get_option('docdir')
 # if docdir == ''
 #         docdir = join_paths(datadir, 'doc/systemd')
@@ -244,9 +244,9 @@ conf.set_quoted('SYSTEM_CONFIG_UNIT_PATH',                    join_paths(pkgsysc
 # conf.set_quoted('SYSTEM_SYSVRCND_PATH',                       sysvrcnd_path)
 # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_START',                 get_option('rc-local'))
 # conf.set_quoted('RC_LOCAL_SCRIPT_PATH_STOP',                  get_option('halt-local'))
-#
+# 
 # conf.set('ANSI_OK_COLOR',                                     'ANSI_' + get_option('ok-color').underscorify().to_upper())
-#
+# 
 # conf.set_quoted('USER_CONFIG_UNIT_PATH',                      join_paths(pkgsysconfdir, 'user'))
 # conf.set_quoted('USER_DATA_UNIT_PATH',                        userunitdir)
 # conf.set_quoted('CERTIFICATE_ROOT',                           get_option('certificate-root'))
@@ -639,7 +639,7 @@ env = find_program('env')
 # meson_make_symlink = meson.source_root() + '/tools/meson-make-symlink.sh'
 #else /// Needed by elogind
 meson_symlink_headers = meson.source_root() + '/tools/meson-symlink_headers.sh'
-#endif // 1
+#endif // 0
 mkdir_p = 'mkdir -p $DESTDIR/@0@'
 #if 0 /// unneeded by elogind
 # test_efi_create_disk_sh = find_program('test/test-efi-create-disk.sh')
@@ -823,7 +823,7 @@ message('maximum system GID is @0@'.format(system_gid_max))
 # conf.set('DYNAMIC_UID_MAX', dynamic_uid_max)
 # substs.set('dynamicuidmin', dynamic_uid_min)
 # substs.set('dynamicuidmax', dynamic_uid_max)
-#
+# 
 # container_uid_base_min = get_option('container-uid-base-min').to_int()
 # container_uid_base_max = get_option('container-uid-base-max').to_int()
 # conf.set('CONTAINER_UID_BASE_MIN', container_uid_base_min)
@@ -895,15 +895,15 @@ substs.set('TTY_GID', tty_gid)
 #         users_gid = '-'
 # endif
 # substs.set('USERS_GID', users_gid)
-#
+# 
 # if get_option('adm-group')
 #         m4_defines += ['-DENABLE_ADM_GROUP']
 # endif
-#
+# 
 # if get_option('wheel-group')
 #         m4_defines += ['-DENABLE_WHEEL_GROUP']
 # endif
-#
+# 
 # substs.set('DEV_KVM_MODE', get_option('dev-kvm-mode'))
 # substs.set('GROUP_RENDER_MODE', get_option('group-render-mode'))
 #endif // 0
@@ -916,7 +916,7 @@ substs.set('KILL_USER_PROCESSES', kill_user_processes ? 'yes' : 'no')
 # dns_servers = get_option('dns-servers')
 # conf.set_quoted('DNS_SERVERS', dns_servers)
 # substs.set('DNS_SERVERS', dns_servers)
-#
+# 
 # ntp_servers = get_option('ntp-servers')
 # conf.set_quoted('NTP_SERVERS', ntp_servers)
 # substs.set('NTP_SERVERS', ntp_servers)
@@ -974,7 +974,7 @@ endif
 # libmount = dependency('mount',
 #                       version : '>= 2.30',
 #                       required : not fuzzer_build)
-#
+# 
 # want_seccomp = get_option('seccomp')
 # if want_seccomp != 'false' and not fuzzer_build
 #         libseccomp = dependency('libseccomp',
@@ -1072,7 +1072,7 @@ conf.set10('HAVE_AUDIT', have)
 #         libblkid = []
 # endif
 # conf.set10('HAVE_BLKID', have)
-#
+# 
 # want_kmod = get_option('kmod')
 # if want_kmod != 'false' and not fuzzer_build
 #         libkmod = dependency('libkmod',
@@ -1115,7 +1115,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_MICROHTTPD', have)
 # m4_defines += have ? ['-DHAVE_MICROHTTPD'] : []
-#
+# 
 # want_libcryptsetup = get_option('libcryptsetup')
 # if want_libcryptsetup != 'false' and not fuzzer_build
 #         libcryptsetup = dependency('libcryptsetup',
@@ -1127,7 +1127,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libcryptsetup = []
 # endif
 # conf.set10('HAVE_LIBCRYPTSETUP', have)
-#
+# 
 # want_libcurl = get_option('libcurl')
 # if want_libcurl != 'false' and not fuzzer_build
 #         libcurl = dependency('libcurl',
@@ -1140,13 +1140,13 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBCURL', have)
 # m4_defines += have ? ['-DHAVE_LIBCURL'] : []
-#
+# 
 # want_libidn = get_option('libidn')
 # want_libidn2 = get_option('libidn2')
 # if want_libidn == 'true' and want_libidn2 == 'true'
 #         error('libidn and libidn2 cannot be requested simultaneously')
 # endif
-#
+# 
 # if want_libidn != 'false' and want_libidn2 != 'true' and not fuzzer_build
 #         libidn = dependency('libidn',
 #                             required : want_libidn == 'true')
@@ -1167,7 +1167,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIDN2', have)
 # m4_defines += have ? ['-DHAVE_LIBIDN2'] : []
-#
+# 
 # want_libiptc = get_option('libiptc')
 # if want_libiptc != 'false' and not fuzzer_build
 #         libiptc = dependency('libiptc',
@@ -1179,7 +1179,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 # endif
 # conf.set10('HAVE_LIBIPTC', have)
 # m4_defines += have ? ['-DHAVE_LIBIPTC'] : []
-#
+# 
 # want_qrencode = get_option('qrencode')
 # if want_qrencode != 'false' and not fuzzer_build
 #         libqrencode = dependency('libqrencode',
@@ -1190,7 +1190,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libqrencode = []
 # endif
 # conf.set10('HAVE_QRENCODE', have)
-#
+# 
 # want_gcrypt = get_option('gcrypt')
 # if want_gcrypt != 'false' and not fuzzer_build
 #         libgcrypt = cc.find_library('gcrypt', required : want_gcrypt == 'true')
@@ -1205,7 +1205,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgpg_error = []
 # endif
 # conf.set10('HAVE_GCRYPT', have)
-#
+# 
 # want_gnutls = get_option('gnutls')
 # if want_gnutls != 'false' and not fuzzer_build
 #         libgnutls = dependency('gnutls',
@@ -1217,7 +1217,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libgnutls = []
 # endif
 # conf.set10('HAVE_GNUTLS', have)
-#
+# 
 # want_elfutils = get_option('elfutils')
 # if want_elfutils != 'false' and not fuzzer_build
 #         libdw = dependency('libdw',
@@ -1228,7 +1228,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libdw = []
 # endif
 # conf.set10('HAVE_ELFUTILS', have)
-#
+# 
 # want_zlib = get_option('zlib')
 # if want_zlib != 'false' and not fuzzer_build
 #         libz = dependency('zlib',
@@ -1239,7 +1239,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libz = []
 # endif
 # conf.set10('HAVE_ZLIB', have)
-#
+# 
 # want_bzip2 = get_option('bzip2')
 # if want_bzip2 != 'false' and not fuzzer_build
 #         libbzip2 = cc.find_library('bz2',
@@ -1250,7 +1250,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libbzip2 = []
 # endif
 # conf.set10('HAVE_BZIP2', have)
-#
+# 
 # want_xz = get_option('xz')
 # if want_xz != 'false' and not fuzzer_build
 #         libxz = dependency('liblzma',
@@ -1261,7 +1261,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         libxz = []
 # endif
 # conf.set10('HAVE_XZ', have)
-#
+# 
 # want_lz4 = get_option('lz4')
 # if want_lz4 != 'false' and not fuzzer_build
 #         liblz4 = dependency('liblz4',
@@ -1272,7 +1272,7 @@ m4_defines += have ? ['-DHAVE_PAM'] : []
 #         liblz4 = []
 # endif
 # conf.set10('HAVE_LZ4', have)
-#
+# 
 # want_xkbcommon = get_option('xkbcommon')
 # if want_xkbcommon != 'false' and not fuzzer_build
 #         libxkbcommon = dependency('xkbcommon',
@@ -1356,7 +1356,7 @@ conf.set10('HAVE_DBUS', have)
 # conf.set('DEFAULT_DNSSEC_MODE',
 #          'DNSSEC_' + default_dnssec.underscorify().to_upper())
 # substs.set('DEFAULT_DNSSEC_MODE', default_dnssec)
-#
+# 
 # want_importd = get_option('importd')
 # if want_importd != 'false'
 #         have = (conf.get('HAVE_LIBCURL') == 1 and
@@ -1371,7 +1371,7 @@ conf.set10('HAVE_DBUS', have)
 #         have = false
 # endif
 # conf.set10('ENABLE_IMPORTD', have)
-#
+# 
 # want_remote = get_option('remote')
 # if want_remote != 'false'
 #         have_deps = [conf.get('HAVE_MICROHTTPD') == 1,
@@ -1444,7 +1444,7 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
 #if 0 /// UNNEEDED by elogind
 # if get_option('efi')
 #         efi_arch = host_machine.cpu_family()
-#
+# 
 #         if efi_arch == 'x86'
 #                 EFI_MACHINE_TYPE_NAME = 'ia32'
 #                 gnu_efi_arch = 'ia32'
@@ -1461,10 +1461,10 @@ conf.set10('SYSTEMD_SLOW_TESTS_DEFAULT', slow_tests)
 #                 EFI_MACHINE_TYPE_NAME = ''
 #                 gnu_efi_arch = ''
 #         endif
-#
+# 
 #         have = true
 #         conf.set_quoted('EFI_MACHINE_TYPE_NAME', EFI_MACHINE_TYPE_NAME)
-#
+# 
 #         conf.set('SD_TPM_PCR', get_option('tpm-pcrindex').to_int())
 # else
 #         have = false
@@ -1581,7 +1581,7 @@ subdir('src/shared')
 # subdir('src/core')
 # subdir('src/udev')
 # subdir('src/network')
-#
+# 
 # subdir('src/analyze')
 # subdir('src/journal-remote')
 # subdir('src/coredump')
@@ -1621,14 +1621,14 @@ test_dlopen = executable(
 #                  ['systemd',    'ENABLE_NSS_SYSTEMD'],
 #                  ['mymachines', 'ENABLE_MACHINED'],
 #                  ['resolve',    'ENABLE_RESOLVE']]
-#
+# 
 #         condition = tuple[1] == '' or conf.get(tuple[1]) == 1
 #         if condition
 #                 module = tuple[0]
-#
+# 
 #                 sym = 'src/nss-@0@/nss-@0@.sym'.format(module)
 #                 version_script_arg = join_paths(meson.current_source_dir(), sym)
-#
+# 
 #                 nss = shared_library(
 #                         'nss_' + module,
 #                         'src/nss-@0@/nss-@0@.c'.format(module),
@@ -1646,13 +1646,13 @@ test_dlopen = executable(
 #                         link_depends : sym,
 #                         install : true,
 #                         install_dir : rootlibdir)
-#
+# 
 #                 # We cannot use shared_module because it does not support version suffix.
 #                 # Unfortunately shared_library insists on creating the symlink…
 #                 meson.add_install_script('sh', '-c',
 #                                          'rm $DESTDIR@0@/libnss_@1@.so'
 #                                          .format(rootlibdir, module))
-#
+# 
 #                 test('dlopen-nss_' + module,
 #                      test_dlopen,
 #                      args : [nss.full_path()]) # path to dlopen must include a slash
@@ -1677,11 +1677,11 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # meson.add_install_script(meson_make_symlink,
 #                          join_paths(rootlibexecdir, 'systemd'),
 #                          join_paths(rootsbindir, 'init'))
-#
+# 
 # exe = executable('systemd-analyze',
 #                  systemd_analyze_sources,
 #                  include_directories : includes,
@@ -1696,7 +1696,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-journald',
 #            systemd_journald_sources,
 #            include_directories : includes,
@@ -1709,7 +1709,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # exe = executable('systemd-cat',
 #                  systemd_cat_sources,
 #                  include_directories : includes,
@@ -1719,7 +1719,7 @@ test_dlopen = executable(
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('journalctl',
 #                  journalctl_sources,
 #                  include_directories : includes,
@@ -1733,7 +1733,7 @@ test_dlopen = executable(
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-getty-generator',
 #            'src/getty-generator/getty-generator.c',
 #            include_directories : includes,
@@ -1741,7 +1741,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+# 
 # executable('systemd-debug-generator',
 #            'src/debug-generator/debug-generator.c',
 #            include_directories : includes,
@@ -1749,7 +1749,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+# 
 # executable('systemd-fstab-generator',
 #            'src/fstab-generator/fstab-generator.c',
 #            'src/core/mount-setup.c',
@@ -1758,7 +1758,7 @@ test_dlopen = executable(
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+# 
 # if conf.get('ENABLE_ENVIRONMENT_D') == 1
 #         executable('30-systemd-environment-d-generator',
 #                    'src/environment-d-generator/environment-d-generator.c',
@@ -1767,12 +1767,12 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : userenvgeneratordir)
-#
+# 
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(sysconfdir, 'environment'),
 #                                  join_paths(environmentdir, '99-environment.conf'))
 # endif
-#
+# 
 # if conf.get('ENABLE_HIBERNATE') == 1
 #         executable('systemd-hibernate-resume-generator',
 #                    'src/hibernate-resume/hibernate-resume-generator.c',
@@ -1781,7 +1781,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+# 
 #         executable('systemd-hibernate-resume',
 #                    'src/hibernate-resume/hibernate-resume.c',
 #                    include_directories : includes,
@@ -1790,7 +1790,7 @@ test_dlopen = executable(
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('HAVE_BLKID') == 1
 #         executable('systemd-gpt-auto-generator',
 #                    'src/gpt-auto-generator/gpt-auto-generator.c',
@@ -1801,7 +1801,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+# 
 #         exe = executable('systemd-dissect',
 #                          'src/dissect/dissect.c',
 #                          include_directories : includes,
@@ -1811,7 +1811,7 @@ test_dlopen = executable(
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_RESOLVE') == 1
 #         executable('systemd-resolved',
 #                    systemd_resolved_sources,
@@ -1826,7 +1826,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('systemd-resolve',
 #                          systemd_resolve_sources,
 #                          include_directories : includes,
@@ -1841,7 +1841,7 @@ test_dlopen = executable(
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_LOGIND') == 1
 #         executable('systemd-logind',
 #                    systemd_logind_sources,
@@ -1853,7 +1853,7 @@ test_dlopen = executable(
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('loginctl',
 #                          loginctl_sources,
 #                          include_directories : includes,
@@ -1865,7 +1865,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-#
+# 
 #         exe = executable('systemd-inhibit',
 #                          'src/login/inhibit.c',
 #                          include_directories : includes,
@@ -1874,7 +1874,7 @@ test_dlopen = executable(
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-#
+# 
 #         if conf.get('HAVE_PAM') == 1
 #                 version_script_arg = join_paths(meson.current_source_dir(), pam_systemd_sym)
 #                 pam_systemd = shared_library(
@@ -1892,7 +1892,7 @@ test_dlopen = executable(
 #                         link_depends : pam_systemd_sym,
 #                         install : true,
 #                         install_dir : pamlibdir)
-#
+# 
 #                 test('dlopen-pam_systemd',
 #                      test_dlopen,
 #                      args : [pam_systemd.full_path()]) # path to dlopen must include a slash
@@ -1965,7 +1965,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
 #         exe = executable('bootctl',
 #                          'src/boot/bootctl.c',
@@ -1976,7 +1976,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # exe = executable('systemd-socket-activate', 'src/activate/activate.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1984,7 +1984,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemctl', 'src/systemctl/systemctl.c',
 #                  include_directories : includes,
 #                  link_with : [libshared],
@@ -1997,13 +1997,13 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # foreach alias : ['halt', 'poweroff', 'reboot', 'runlevel', 'shutdown', 'telinit']
 #         meson.add_install_script(meson_make_symlink,
 #                                  join_paths(rootbindir, 'systemctl'),
 #                                  join_paths(rootsbindir, alias))
 # endforeach
-#
+# 
 # if conf.get('ENABLE_BACKLIGHT') == 1
 #         executable('systemd-backlight',
 #                    'src/backlight/backlight.c',
@@ -2013,7 +2013,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('ENABLE_RFKILL') == 1
 #         executable('systemd-rfkill',
 #                    'src/rfkill/rfkill.c',
@@ -2023,7 +2023,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # executable('systemd-system-update-generator',
 #            'src/system-update-generator/system-update-generator.c',
 #            include_directories : includes,
@@ -2031,7 +2031,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : systemgeneratordir)
-#
+# 
 # if conf.get('HAVE_LIBCRYPTSETUP') == 1
 #         executable('systemd-cryptsetup',
 #                    'src/cryptsetup/cryptsetup.c',
@@ -2041,7 +2041,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         executable('systemd-cryptsetup-generator',
 #                    'src/cryptsetup/cryptsetup-generator.c',
 #                    include_directories : includes,
@@ -2050,7 +2050,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+# 
 #         executable('systemd-veritysetup',
 #                    'src/veritysetup/veritysetup.c',
 #                    include_directories : includes,
@@ -2059,7 +2059,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         executable('systemd-veritysetup-generator',
 #                    'src/veritysetup/veritysetup-generator.c',
 #                    include_directories : includes,
@@ -2069,7 +2069,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-#
+# 
 # if conf.get('HAVE_SYSV_COMPAT') == 1
 #         executable('systemd-sysv-generator',
 #                    'src/sysv-generator/sysv-generator.c',
@@ -2078,7 +2078,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : systemgeneratordir)
-#
+# 
 #         executable('systemd-rc-local-generator',
 #                    'src/rc-local-generator/rc-local-generator.c',
 #                    include_directories : includes,
@@ -2087,7 +2087,7 @@ endif
 #                    install : true,
 #                    install_dir : systemgeneratordir)
 # endif
-#
+# 
 # if conf.get('ENABLE_HOSTNAMED') == 1
 #         executable('systemd-hostnamed',
 #                    'src/hostname/hostnamed.c',
@@ -2096,7 +2096,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('hostnamectl',
 #                          'src/hostname/hostnamectl.c',
 #                          include_directories : includes,
@@ -2105,7 +2105,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_LOCALED') == 1
 #         if conf.get('HAVE_XKBCOMMON') == 1
 #                 # logind will load libxkbcommon.so dynamically on its own
@@ -2113,7 +2113,7 @@ endif
 #         else
 #                 deps = []
 #         endif
-#
+# 
 #         executable('systemd-localed',
 #                    systemd_localed_sources,
 #                    include_directories : includes,
@@ -2122,7 +2122,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('localectl',
 #                          localectl_sources,
 #                          include_directories : includes,
@@ -2131,7 +2131,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_TIMEDATED') == 1
 #         executable('systemd-timedated',
 #                    'src/timedate/timedated.c',
@@ -2140,7 +2140,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('timedatectl',
 #                          'src/timedate/timedatectl.c',
 #                          include_directories : includes,
@@ -2149,7 +2149,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_TIMESYNCD') == 1
 #         executable('systemd-timesyncd',
 #                    systemd_timesyncd_sources,
@@ -2161,7 +2161,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('ENABLE_MACHINED') == 1
 #         executable('systemd-machined',
 #                    systemd_machined_sources,
@@ -2171,7 +2171,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('machinectl',
 #                          'src/machine/machinectl.c',
 #                          include_directories : includes,
@@ -2184,7 +2184,7 @@ endif
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_IMPORTD') == 1
 #         executable('systemd-importd',
 #                    systemd_importd_sources,
@@ -2194,7 +2194,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         systemd_pull = executable('systemd-pull',
 #                                   systemd_pull_sources,
 #                                   include_directories : includes,
@@ -2207,7 +2207,7 @@ endif
 #                                   install_rpath : rootlibexecdir,
 #                                   install : true,
 #                                   install_dir : rootlibexecdir)
-#
+# 
 #         systemd_import = executable('systemd-import',
 #                                     systemd_import_sources,
 #                                     include_directories : includes,
@@ -2219,7 +2219,7 @@ endif
 #                                     install_rpath : rootlibexecdir,
 #                                     install : true,
 #                                     install_dir : rootlibexecdir)
-#
+# 
 #         systemd_export = executable('systemd-export',
 #                                     systemd_export_sources,
 #                                     include_directories : includes,
@@ -2233,7 +2233,7 @@ endif
 #                                     install_dir : rootlibexecdir)
 #         public_programs += [systemd_pull, systemd_import, systemd_export]
 # endif
-#
+# 
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_LIBCURL') == 1
 #         exe = executable('systemd-journal-upload',
 #                          systemd_journal_upload_sources,
@@ -2249,7 +2249,7 @@ endif
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_REMOTE') == 1 and conf.get('HAVE_MICROHTTPD') == 1
 #         s_j_remote = executable('systemd-journal-remote',
 #                                 systemd_journal_remote_sources,
@@ -2263,7 +2263,7 @@ endif
 #                                 install_rpath : rootlibexecdir,
 #                                 install : true,
 #                                 install_dir : rootlibexecdir)
-#
+# 
 #         s_j_gatewayd = executable('systemd-journal-gatewayd',
 #                                   systemd_journal_gatewayd_sources,
 #                                   include_directories : includes,
@@ -2278,7 +2278,7 @@ endif
 #                                   install_dir : rootlibexecdir)
 #         public_programs += [s_j_remote, s_j_gatewayd]
 # endif
-#
+# 
 # if conf.get('ENABLE_COREDUMP') == 1
 #         executable('systemd-coredump',
 #                    systemd_coredump_sources,
@@ -2292,7 +2292,7 @@ endif
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('coredumpctl',
 #                          coredumpctl_sources,
 #                          include_directories : includes,
@@ -2304,7 +2304,7 @@ endif
 #                          install : true)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_BINFMT') == 1
 #         exe = executable('systemd-binfmt',
 #                          'src/binfmt/binfmt.c',
@@ -2314,13 +2314,13 @@ endif
 #                          install : true,
 #                          install_dir : rootlibexecdir)
 #         public_programs += [exe]
-#
+# 
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(binfmtdir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'binfmt.d')))
 # endif
-#
+# 
 # if conf.get('ENABLE_VCONSOLE') == 1
 #         executable('systemd-vconsole-setup',
 #                    'src/vconsole/vconsole-setup.c',
@@ -2330,7 +2330,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('ENABLE_RANDOMSEED') == 1
 #         executable('systemd-random-seed',
 #                    'src/random-seed/random-seed.c',
@@ -2340,7 +2340,7 @@ endif
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # if conf.get('ENABLE_FIRSTBOOT') == 1
 #         executable('systemd-firstboot',
 #                    'src/firstboot/firstboot.c',
@@ -2351,7 +2351,7 @@ endif
 #                    install : true,
 #                    install_dir : rootbindir)
 # endif
-#
+# 
 # executable('systemd-remount-fs',
 #            'src/remount-fs/remount-fs.c',
 #            'src/core/mount-setup.c',
@@ -2361,7 +2361,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('systemd-machine-id-setup',
 #            'src/machine-id-setup/machine-id-setup-main.c',
 #            'src/core/machine-id-setup.c',
@@ -2371,7 +2371,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootbindir)
-#
+# 
 # executable('systemd-fsck',
 #            'src/fsck/fsck.c',
 #            include_directories : includes,
@@ -2379,7 +2379,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('elogind-growfs',
 #            'src/partition/growfs.c',
 #            include_directories : includes,
@@ -2388,7 +2388,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('elogind-makefs',
 #            'src/partition/makefs.c',
 #            include_directories : includes,
@@ -2396,7 +2396,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('systemd-sleep',
 #            'src/sleep/sleep.c',
 #            include_directories : includes,
@@ -2404,7 +2404,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # exe = executable('systemd-sysctl',
 #                  'src/sysctl/sysctl.c',
 #                  include_directories : includes,
@@ -2413,7 +2413,7 @@ endif
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-ac-power',
 #            'src/ac-power/ac-power.c',
 #            include_directories : includes,
@@ -2421,7 +2421,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # exe = executable('systemd-detect-virt',
 #                  'src/detect-virt/detect-virt.c',
 #                  include_directories : includes,
@@ -2429,7 +2429,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-delta',
 #                  'src/delta/delta.c',
 #                  include_directories : includes,
@@ -2437,7 +2437,7 @@ endif
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-escape',
 #                  'src/escape/escape.c',
 #                  include_directories : includes,
@@ -2446,7 +2446,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-notify',
 #                  'src/notify/notify.c',
 #                  include_directories : includes,
@@ -2455,7 +2455,7 @@ endif
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-volatile-root',
 #            'src/volatile-root/volatile-root.c',
 #            include_directories : includes,
@@ -2463,7 +2463,7 @@ endif
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('systemd-cgroups-agent',
 #            'src/cgroups-agent/cgroups-agent.c',
 #            include_directories : includes,
@@ -2489,7 +2489,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-ask-password',
 #                  'src/ask-password/ask-password.c',
 #                  include_directories : includes,
@@ -2498,7 +2498,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-reply-password',
 #            'src/reply-password/reply-password.c',
 #            include_directories : includes,
@@ -2506,7 +2506,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # exe = executable('systemd-tty-ask-password-agent',
 #                  'src/tty-ask-password-agent/tty-ask-password-agent.c',
 #                  include_directories : includes,
@@ -2515,7 +2515,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-cgls',
 #                  'src/cgls/cgls.c',
 #                  include_directories : includes,
@@ -2523,7 +2523,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-cgtop',
 #                  'src/cgtop/cgtop.c',
 #                  include_directories : includes,
@@ -2531,7 +2531,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-initctl',
 #            'src/initctl/initctl.c',
 #            include_directories : includes,
@@ -2539,7 +2539,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # exe = executable('systemd-mount',
 #                  'src/mount/mount-tool.c',
 #                  include_directories : includes,
@@ -2547,10 +2547,10 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # meson.add_install_script(meson_make_symlink,
 #                          'systemd-mount', join_paths(bindir, 'systemd-umount'))
-#
+# 
 # exe = executable('systemd-run',
 #                  'src/run/run.c',
 #                  include_directories : includes,
@@ -2558,7 +2558,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-stdio-bridge',
 #                  'src/stdio-bridge/stdio-bridge.c',
 #                  include_directories : includes,
@@ -2566,7 +2566,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # exe = executable('busctl',
 #                  'src/busctl/busctl.c',
 #                  'src/busctl/busctl-introspect.c',
@@ -2576,7 +2576,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # if conf.get('ENABLE_SYSUSERS') == 1
 #         exe = executable('systemd-sysusers',
 #                          'src/sysusers/sysusers.c',
@@ -2587,7 +2587,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_TMPFILES') == 1
 #         exe = executable('systemd-tmpfiles',
 #                          'src/tmpfiles/tmpfiles.c',
@@ -2598,13 +2598,13 @@ executable('elogind-cgroups-agent',
 #                          install : true,
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
-#
+# 
 #         test('test-systemd-tmpfiles',
 #              test_systemd_tmpfiles_py,
 #              args : exe.full_path())
 #         # https://github.com/mesonbuild/meson/issues/2681
 # endif
-#
+# 
 # if conf.get('ENABLE_HWDB') == 1
 #         exe = executable('systemd-hwdb',
 #                          'src/hwdb/hwdb.c',
@@ -2616,7 +2616,7 @@ executable('elogind-cgroups-agent',
 #                          install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # if conf.get('ENABLE_QUOTACHECK') == 1
 #         executable('systemd-quotacheck',
 #                    'src/quotacheck/quotacheck.c',
@@ -2626,7 +2626,7 @@ executable('elogind-cgroups-agent',
 #                    install : true,
 #                    install_dir : rootlibexecdir)
 # endif
-#
+# 
 # exe = executable('systemd-socket-proxyd',
 #                  'src/socket-proxy/socket-proxyd.c',
 #                  include_directories : includes,
@@ -2636,7 +2636,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+# 
 # exe = executable('systemd-udevd',
 #                  systemd_udevd_sources,
 #                  include_directories : includes,
@@ -2653,7 +2653,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootlibexecdir)
 # public_programs += [exe]
-#
+# 
 # exe = executable('udevadm',
 #                  udevadm_sources,
 #                  c_args : ['-DLOG_REALM=LOG_REALM_UDEV'],
@@ -2670,7 +2670,7 @@ executable('elogind-cgroups-agent',
 #                  install : true,
 #                  install_dir : rootbindir)
 # public_programs += [exe]
-#
+# 
 # executable('systemd-shutdown',
 #            systemd_shutdown_sources,
 #            include_directories : includes,
@@ -2678,7 +2678,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('systemd-update-done',
 #            'src/update-done/update-done.c',
 #            include_directories : includes,
@@ -2686,7 +2686,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # executable('systemd-update-utmp',
 #            'src/update-utmp/update-utmp.c',
 #            include_directories : includes,
@@ -2695,7 +2695,7 @@ executable('elogind-cgroups-agent',
 #            install_rpath : rootlibexecdir,
 #            install : true,
 #            install_dir : rootlibexecdir)
-#
+# 
 # if conf.get('HAVE_KMOD') == 1
 #         executable('systemd-modules-load',
 #                    'src/modules-load/modules-load.c',
@@ -2705,13 +2705,13 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(modulesloaddir))
 #         meson.add_install_script('sh', '-c',
 #                                  mkdir_p.format(join_paths(sysconfdir, 'modules-load.d')))
 # endif
-#
+# 
 # exe = executable('systemd-nspawn',
 #                  systemd_nspawn_sources,
 #                  'src/core/mount-setup.c', # FIXME: use a variable?
@@ -2727,7 +2727,7 @@ executable('elogind-cgroups-agent',
 #                  install_rpath : rootlibexecdir,
 #                  install : true)
 # public_programs += [exe]
-#
+# 
 # if conf.get('ENABLE_NETWORKD') == 1
 #         executable('systemd-networkd',
 #                    systemd_networkd_sources,
@@ -2740,7 +2740,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         executable('systemd-networkd-wait-online',
 #                    systemd_networkd_wait_online_sources,
 #                    include_directories : includes,
@@ -2749,7 +2749,7 @@ executable('elogind-cgroups-agent',
 #                    install_rpath : rootlibexecdir,
 #                    install : true,
 #                    install_dir : rootlibexecdir)
-#
+# 
 #         exe = executable('networkctl',
 #                    networkctl_sources,
 #                    include_directories : includes,
@@ -2760,7 +2760,7 @@ executable('elogind-cgroups-agent',
 #                    install_dir : rootbindir)
 #         public_programs += [exe]
 # endif
-#
+# 
 # executable('systemd-sulogin-shell',
 #            ['src/sulogin-shell/sulogin-shell.c'],
 #            include_directories : includes,
@@ -2836,7 +2836,7 @@ endforeach
 #         install_dir : testsdir)
 # test('test-libsystemd-sym',
 #      test_libsystemd_sym)
-#
+# 
 # test_libudev_sym = executable(
 #         'test-libudev-sym',
 #         test_libudev_sym_c,
@@ -2847,26 +2847,26 @@ endforeach
 #         install_dir : testsdir)
 # test('test-libudev-sym',
 #      test_libudev_sym)
-#
+# 
 # ############################################################
-#
+# 
 # fuzzer_exes = []
-#
+# 
 # foreach tuple : fuzzers
 #         sources = tuple[0]
 #         link_with = tuple[1].length() > 0 ? tuple[1] : [libshared]
 #         dependencies = tuple[2]
 #         defs = tuple.length() >= 4 ? tuple[3] : []
 #         incs = tuple.length() >= 5 ? tuple[4] : includes
-#
+# 
 #         if fuzzer_build
 #                 dependencies += fuzzing_engine
 #         else
 #                 sources += 'src/fuzz/fuzz-main.c'
 #         endif
-#
+# 
 #         name = sources[0].split('/')[-1].split('.')[0]
-#
+# 
 #         fuzzer_exes += executable(
 #                 name,
 #                 sources,
@@ -2876,13 +2876,13 @@ endforeach
 #                 c_args : defs,
 #                 install : false)
 # endforeach
-#
+# 
 # run_target('fuzzers',
 #         depends : fuzzer_exes,
 #         command : ['true'])
-#
+# 
 # ############################################################
-#
+# 
 #else
 test_libelogind_sym = executable(
         'test-libelogind-sym',
@@ -2899,7 +2899,7 @@ make_man_index_py = find_program('tools/make-man-index.py')
 xml_helper_py = find_program('tools/xml_helper.py')
 #if 0 /// UNNEEDED by elogind
 # hwdb_update_sh = find_program('tools/meson-hwdb-update.sh')
-#
+# 
 # subdir('units')
 # subdir('sysctl.d')
 # subdir('sysusers.d')
@@ -2968,15 +2968,15 @@ endforeach
 #         a = p.split('/')[-3]
 #         b = p.split('/')[-2]
 #         c = p.split('/')[-1]
-#
+# 
 #         if a == 'address'
 #                 build = sanitize_address
 #         else
 #                 error('unknown sanitizer @0@'.format(a))
 #         endif
-#
+# 
 #         name = '@1@:@0@'.format(a, b)
-#
+# 
 #         if name != prev
 #                 if want_tests == 'false'
 #                         message('Not compiling @0@ because tests is set to false'.format(name))
@@ -2996,7 +2996,7 @@ endforeach
 #                 endif
 #         endif
 #         prev = name
-#
+# 
 #         if want_tests != 'false' and slow_tests
 #                 test(c, env, args : [exe.full_path(),
 #                                      join_paths(meson.source_root(),
@@ -3120,7 +3120,7 @@ status = [
 #         'nobody group name:                 @0@'.format(nobody_group),
 #         'fallback hostname:                 @0@'.format(get_option('fallback-hostname')),
 #         'symbolic gateway hostnames:        @0@'.format(', '.join(gateway_hostnames)),
-#
+# 
 #         'default DNSSEC mode:               @0@'.format(default_dnssec),
 #         'default cgroup hierarchy:          @0@'.format(default_hierarchy),
 #endif // 0
@@ -3132,7 +3132,7 @@ status = [
 # status += [
 #         'default DNS servers:               @0@'.format(alt_dns_servers),
 #         'default NTP servers:               @0@'.format(alt_ntp_servers)]
-#
+# 
 # alt_time_epoch = run_command('date', '-Is', '-u', '-d',
 #                              '@@0@'.format(time_epoch)).stdout().strip()
 # status += [
@@ -3148,7 +3148,7 @@ status = [
 # if conf.get('ENABLE_EFI') == 1
 #         status += [
 #                 'efi arch:                          @0@'.format(efi_arch)]
-#
+# 
 #         if have_gnu_efi
 #                 status += [
 #                         'EFI machine type:                  @0@'.format(EFI_MACHINE_TYPE_NAME),