Browse Source

meson: Fix migration errors

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
suites/experimental
Sven Eden 1 year ago
parent
commit
dd7774cc82
  1. 9
      meson.build
  2. 6
      meson_options.txt

9
meson.build

@ -287,8 +287,8 @@ conf.set_quoted('ELOGIND_UACCESS_COMMAND_PATH', join_paths(rootlib
conf.set_quoted('SYSTEMD_BINARY_PATH', join_paths(rootlibexecdir, 'elogind'))
#endif // 0
conf.set_quoted('ROOTPREFIX', rootprefixdir)
conf.set_quoted('ROOTPREFIX_NOSLASH', rootprefixdir_noslash)
#if 0 /// UNNEEDED by elogind
# conf.set_quoted('ROOTPREFIX_NOSLASH', rootprefixdir_noslash)
# conf.set_quoted('RANDOM_SEED_DIR', randomseeddir)
# conf.set_quoted('RANDOM_SEED', join_paths(randomseeddir, 'random-seed'))
# conf.set_quoted('SYSTEMD_CRYPTSETUP_PATH', join_paths(rootlibexecdir, 'systemd-cryptsetup'))
@ -1675,7 +1675,8 @@ conf.set10('ENABLE_REMOTE', have)
# 'vconsole',
# 'xdg-autostart']
#else // 0
'smack']
foreach term : ['smack',
'utmp']
#endif // 0
have = get_option(term)
name = 'ENABLE_' + term.underscorify().to_upper()
@ -4181,7 +4182,9 @@ foreach tuple : [
['link-networkd-shared', get_option('link-networkd-shared')],
['link-timesyncd-shared', get_option('link-timesyncd-shared')],
['kernel-install', get_option('kernel-install')],
['elogind-analyze', conf.get('ENABLE_ANALYZE') == 1],
#if 0 /// there is no elogind analyze
# ['systemd-analyze', conf.get('ENABLE_ANALYZE') == 1],
#endif // 0
]
if tuple.length() >= 2

6
meson_options.txt

@ -454,5 +454,7 @@ option('ok-color', type: 'combo',
#endif // 0
option('kernel-install', type: 'boolean', value: 'true',
description : 'install kernel-install and associated files')
option('analyze', type: 'boolean', value: 'true',
description : 'install elogind-analyze')
#if 0 /// there is no elogind analyze
# option('analyze', type: 'boolean', value: 'true',
# description : 'install elogind-analyze')
#endif // 0

Loading…
Cancel
Save