meson: reindent

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-04-15 09:45:48 +02:00
parent c5cb37d95e
commit ba081955fc

View File

@ -1232,7 +1232,7 @@ conf.set10('HAVE_LIBFIDO2', have)
want_tpm2 = get_option('tpm2') want_tpm2 = get_option('tpm2')
if want_tpm2 != 'false' and not skip_deps if want_tpm2 != 'false' and not skip_deps
tpm2 = dependency('tss2-esys tss2-rc tss2-mu', tpm2 = dependency('tss2-esys tss2-rc tss2-mu',
required : want_tpm2 == 'true') required : want_tpm2 == 'true')
have = tpm2.found() have = tpm2.found()
else else
have = false have = false
@ -2329,7 +2329,7 @@ if conf.get('ENABLE_HOMED') == 1
endif endif
foreach alias : (['halt', 'poweroff', 'reboot', 'shutdown'] + foreach alias : (['halt', 'poweroff', 'reboot', 'shutdown'] +
(conf.get('HAVE_SYSV_COMPAT') == 1 ? ['runlevel', 'telinit'] : [])) (conf.get('HAVE_SYSV_COMPAT') == 1 ? ['runlevel', 'telinit'] : []))
meson.add_install_script(meson_make_symlink, meson.add_install_script(meson_make_symlink,
join_paths(rootbindir, 'systemctl'), join_paths(rootbindir, 'systemctl'),
join_paths(rootsbindir, alias)) join_paths(rootsbindir, alias))
@ -2750,14 +2750,14 @@ if conf.get('ENABLE_OOMD') == 1
install_dir : rootlibexecdir) install_dir : rootlibexecdir)
public_programs += executable( public_programs += executable(
'oomctl', 'oomctl',
oomctl_sources, oomctl_sources,
include_directories : includes, include_directories : includes,
link_with : [libshared], link_with : [libshared],
dependencies : [], dependencies : [],
install_rpath : rootlibexecdir, install_rpath : rootlibexecdir,
install : true, install : true,
install_dir : rootbindir) install_dir : rootbindir)
endif endif
if conf.get('ENABLE_BINFMT') == 1 if conf.get('ENABLE_BINFMT') == 1
@ -3313,9 +3313,9 @@ custom_target(
'systemd-runtest.env', 'systemd-runtest.env',
output : 'systemd-runtest.env', output : 'systemd-runtest.env',
command : ['sh', '-c', '{ ' + command : ['sh', '-c', '{ ' +
'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) + 'echo SYSTEMD_TEST_DATA=@0@; '.format(join_paths(project_source_root, 'test')) +
'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) + 'echo SYSTEMD_CATALOG_DIR=@0@; '.format(join_paths(project_build_root, 'catalog')) +
'} >@OUTPUT@'], '} >@OUTPUT@'],
build_by_default : true) build_by_default : true)
# We intentionally do not do inline initializations with definitions for # We intentionally do not do inline initializations with definitions for
@ -3814,9 +3814,9 @@ foreach tuple : [
['pstore'], ['pstore'],
['oomd'], ['oomd'],
['polkit'], ['polkit'],
['legacy pkla', install_polkit_pkla], ['legacy pkla', install_polkit_pkla],
['efi'], ['efi'],
['gnu-efi', have_gnu_efi], ['gnu-efi', have_gnu_efi],
['kmod'], ['kmod'],
['xkbcommon'], ['xkbcommon'],
['pcre2'], ['pcre2'],
@ -3829,28 +3829,28 @@ foreach tuple : [
['nss-systemd'], ['nss-systemd'],
['hwdb'], ['hwdb'],
['tpm'], ['tpm'],
['man pages', want_man], ['man pages', want_man],
['html pages', want_html], ['html pages', want_html],
['man page indices', want_man and have_lxml], ['man page indices', want_man and have_lxml],
['SysV compat'], ['SysV compat'],
['utmp'], ['utmp'],
['ldconfig'], ['ldconfig'],
['hibernate'], ['hibernate'],
['adm group', get_option('adm-group')], ['adm group', get_option('adm-group')],
['wheel group', get_option('wheel-group')], ['wheel group', get_option('wheel-group')],
['gshadow'], ['gshadow'],
['debug hashmap'], ['debug hashmap'],
['debug mmap cache'], ['debug mmap cache'],
['debug siphash'], ['debug siphash'],
['valgrind', conf.get('VALGRIND') == 1], ['valgrind', conf.get('VALGRIND') == 1],
['trace logging', conf.get('LOG_TRACE') == 1], ['trace logging', conf.get('LOG_TRACE') == 1],
['install tests', install_tests], ['install tests', install_tests],
['link-udev-shared', get_option('link-udev-shared')], ['link-udev-shared', get_option('link-udev-shared')],
['link-systemctl-shared', get_option('link-systemctl-shared')], ['link-systemctl-shared', get_option('link-systemctl-shared')],
['link-networkd-shared', get_option('link-networkd-shared')], ['link-networkd-shared', get_option('link-networkd-shared')],
['link-timesyncd-shared', get_option('link-timesyncd-shared')], ['link-timesyncd-shared', get_option('link-timesyncd-shared')],
['kernel-install', get_option('kernel-install')], ['kernel-install', get_option('kernel-install')],
['systemd-analyze', conf.get('ENABLE_ANALYZE') == 1], ['systemd-analyze', conf.get('ENABLE_ANALYZE') == 1],
['fexecve'], ['fexecve'],
['standalone-binaries', get_option('standalone-binaries')], ['standalone-binaries', get_option('standalone-binaries')],
] ]