diff options
Diffstat (limited to 'units')
-rw-r--r-- | units/meson.build | 564 | ||||
-rw-r--r-- | units/user/meson.build | 51 |
2 files changed, 306 insertions, 309 deletions
diff --git a/units/meson.build b/units/meson.build index 37903e45c0..58d9e2b28f 100644 --- a/units/meson.build +++ b/units/meson.build @@ -1,313 +1,312 @@ -# -*- mode: meson -*- - units = [ - ['basic.target', ''], - ['bluetooth.target', ''], - ['cryptsetup-pre.target', 'HAVE_LIBCRYPTSETUP'], - ['cryptsetup.target', 'HAVE_LIBCRYPTSETUP', - 'sysinit.target.wants/'], - ['dev-hugepages.mount', '', - 'sysinit.target.wants/'], - ['dev-mqueue.mount', '', - 'sysinit.target.wants/'], - ['emergency.target', ''], - ['exit.target', ''], - ['final.target', ''], - ['getty.target', '', - 'multi-user.target.wants/'], - ['graphical.target', '', - 'runlevel5.target default.target'], - ['halt.target', ''], - ['hibernate.target', 'ENABLE_HIBERNATE'], - ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], - ['initrd-fs.target', ''], - ['initrd-root-device.target', ''], - ['initrd-root-fs.target', ''], - ['initrd-switch-root.target', ''], - ['initrd.target', ''], - ['kexec.target', ''], - ['ldconfig.service', 'ENABLE_LDCONFIG', - 'sysinit.target.wants/'], - ['local-fs-pre.target', ''], - ['local-fs.target', ''], - ['machine.slice', 'ENABLE_MACHINED'], - ['machines.target', 'ENABLE_MACHINED', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['multi-user.target', '', - 'runlevel2.target runlevel3.target runlevel4.target'], - ['network-online.target', ''], - ['network-pre.target', ''], - ['network.target', ''], - ['nss-lookup.target', ''], - ['nss-user-lookup.target', ''], - ['paths.target', ''], - ['poweroff.target', '', - 'runlevel0.target'], - ['printer.target', ''], - ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], - ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], - ['reboot.target', '', - 'runlevel6.target ctrl-alt-del.target'], - ['remote-fs-pre.target', ''], - ['remote-fs.target', '', - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['rescue.target', '', - 'runlevel1.target'], - ['rpcbind.target', ''], - ['shutdown.target', ''], - ['sigpwr.target', ''], - ['sleep.target', ''], - ['slices.target', ''], - ['smartcard.target', ''], - ['sockets.target', ''], - ['sound.target', ''], - ['suspend.target', ''], - ['swap.target', ''], - ['sys-fs-fuse-connections.mount', '', - 'sysinit.target.wants/'], - ['sys-kernel-config.mount', '', - 'sysinit.target.wants/'], - ['sys-kernel-debug.mount', '', - 'sysinit.target.wants/'], - ['sysinit.target', ''], - ['syslog.socket', ''], - ['system-update.target', ''], - ['system.slice', ''], - ['systemd-ask-password-console.path', '', - 'sysinit.target.wants/'], - ['systemd-ask-password-wall.path', '', - 'multi-user.target.wants/'], - ['systemd-coredump.socket', 'ENABLE_COREDUMP', - 'sockets.target.wants/'], - ['systemd-initctl.socket', '', - 'sockets.target.wants/'], - ['systemd-journal-gatewayd.socket', ''], - ['systemd-journal-remote.socket', ''], - ['systemd-journald-audit.socket', '', - 'sockets.target.wants/'], - ['systemd-journald-dev-log.socket', '', - 'sockets.target.wants/'], - ['systemd-journald.socket', '', - 'sockets.target.wants/'], - ['systemd-networkd.socket', '', - join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], - ['systemd-rfkill.socket', 'ENABLE_RFKILL'], - ['systemd-tmpfiles-clean.timer', '', - 'timers.target.wants/'], - ['systemd-udevd-control.socket', '', - 'sockets.target.wants/'], - ['systemd-udevd-kernel.socket', '', - 'sockets.target.wants/'], - ['time-sync.target', ''], - ['timers.target', ''], - ['umount.target', ''], - ['user.slice', ''], - ['var-lib-machines.mount', '', - 'local-fs.target.wants/'], + ['basic.target', ''], + ['bluetooth.target', ''], + ['cryptsetup-pre.target', 'HAVE_LIBCRYPTSETUP'], + ['cryptsetup.target', 'HAVE_LIBCRYPTSETUP', + 'sysinit.target.wants/'], + ['dev-hugepages.mount', '', + 'sysinit.target.wants/'], + ['dev-mqueue.mount', '', + 'sysinit.target.wants/'], + ['emergency.target', ''], + ['exit.target', ''], + ['final.target', ''], + ['getty.target', '', + 'multi-user.target.wants/'], + ['graphical.target', '', + 'runlevel5.target default.target'], + ['halt.target', ''], + ['hibernate.target', 'ENABLE_HIBERNATE'], + ['hybrid-sleep.target', 'ENABLE_HIBERNATE'], + ['initrd-fs.target', ''], + ['initrd-root-device.target', ''], + ['initrd-root-fs.target', ''], + ['initrd-switch-root.target', ''], + ['initrd.target', ''], + ['kexec.target', ''], + ['ldconfig.service', 'ENABLE_LDCONFIG', + 'sysinit.target.wants/'], + ['local-fs-pre.target', ''], + ['local-fs.target', ''], + ['machine.slice', 'ENABLE_MACHINED'], + ['machines.target', 'ENABLE_MACHINED', + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['multi-user.target', '', + 'runlevel2.target runlevel3.target runlevel4.target'], + ['network-online.target', ''], + ['network-pre.target', ''], + ['network.target', ''], + ['nss-lookup.target', ''], + ['nss-user-lookup.target', ''], + ['paths.target', ''], + ['poweroff.target', '', + 'runlevel0.target'], + ['printer.target', ''], + ['proc-sys-fs-binfmt_misc.automount', 'ENABLE_BINFMT', + 'sysinit.target.wants/'], + ['proc-sys-fs-binfmt_misc.mount', 'ENABLE_BINFMT'], + ['reboot.target', '', + 'runlevel6.target ctrl-alt-del.target'], + ['remote-fs-pre.target', ''], + ['remote-fs.target', '', + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['rescue.target', '', + 'runlevel1.target'], + ['rpcbind.target', ''], + ['shutdown.target', ''], + ['sigpwr.target', ''], + ['sleep.target', ''], + ['slices.target', ''], + ['smartcard.target', ''], + ['sockets.target', ''], + ['sound.target', ''], + ['suspend.target', ''], + ['swap.target', ''], + ['sys-fs-fuse-connections.mount', '', + 'sysinit.target.wants/'], + ['sys-kernel-config.mount', '', + 'sysinit.target.wants/'], + ['sys-kernel-debug.mount', '', + 'sysinit.target.wants/'], + ['sysinit.target', ''], + ['syslog.socket', ''], + ['system-update.target', ''], + ['system.slice', ''], + ['systemd-ask-password-console.path', '', + 'sysinit.target.wants/'], + ['systemd-ask-password-wall.path', '', + 'multi-user.target.wants/'], + ['systemd-coredump.socket', 'ENABLE_COREDUMP', + 'sockets.target.wants/'], + ['systemd-initctl.socket', '', + 'sockets.target.wants/'], + ['systemd-journal-gatewayd.socket', ''], + ['systemd-journal-remote.socket', ''], + ['systemd-journald-audit.socket', '', + 'sockets.target.wants/'], + ['systemd-journald-dev-log.socket', '', + 'sockets.target.wants/'], + ['systemd-journald.socket', '', + 'sockets.target.wants/'], + ['systemd-networkd.socket', '', + join_paths(pkgsysconfdir, 'system/sockets.target.wants/')], + ['systemd-rfkill.socket', 'ENABLE_RFKILL'], + ['systemd-tmpfiles-clean.timer', '', + 'timers.target.wants/'], + ['systemd-udevd-control.socket', '', + 'sockets.target.wants/'], + ['systemd-udevd-kernel.socket', '', + 'sockets.target.wants/'], + ['time-sync.target', ''], + ['timers.target', ''], + ['umount.target', ''], + ['user.slice', ''], + ['var-lib-machines.mount', '', + 'local-fs.target.wants/'], ] in_units = [ - ['debug-shell.service', ''], - ['emergency.service', ''], - ['halt-local.service', 'HAVE_SYSV_COMPAT'], - ['initrd-cleanup.service', ''], - ['initrd-parse-etc.service', ''], - ['initrd-switch-root.service', ''], - ['initrd-udevadm-cleanup-db.service', ''], - ['kmod-static-nodes.service', 'HAVE_KMOD ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['quotaon.service', 'ENABLE_QUOTACHECK'], - ['rc-local.service', 'HAVE_SYSV_COMPAT'], - ['rescue.service', ''], - ['system-update-cleanup.service', ''], - ['systemd-ask-password-console.service', ''], - ['systemd-ask-password-wall.service', ''], - ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], - ['systemd-binfmt.service', 'ENABLE_BINFMT', - 'sysinit.target.wants/'], - ['systemd-coredump@.service', 'ENABLE_COREDUMP'], - ['systemd-exit.service', ''], - ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT', - 'sysinit.target.wants/'], - ['systemd-fsck-root.service', ''], - ['systemd-fsck@.service', ''], - ['systemd-halt.service', ''], - ['systemd-hibernate-resume@.service', 'ENABLE_HIBERNATE'], - ['systemd-hibernate.service', 'ENABLE_HIBERNATE'], - ['systemd-hybrid-sleep.service', 'ENABLE_HIBERNATE'], - ['systemd-hostnamed.service', 'ENABLE_HOSTNAMED', - 'dbus-org.freedesktop.hostname1.service'], - ['systemd-hwdb-update.service', 'ENABLE_HWDB', - 'sysinit.target.wants/'], - ['systemd-importd.service', 'ENABLE_IMPORTD', - 'dbus-org.freedesktop.import1.service'], - ['systemd-initctl.service', ''], - ['systemd-journal-catalog-update.service', '', - 'sysinit.target.wants/'], - ['systemd-journal-flush.service', '', - 'sysinit.target.wants/'], - ['systemd-journal-gatewayd.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], - ['systemd-journal-remote.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], - ['systemd-journal-upload.service', 'ENABLE_REMOTE HAVE_LIBCURL'], - ['systemd-journald.service', '', - 'sysinit.target.wants/'], - ['systemd-kexec.service', ''], - ['systemd-localed.service', 'ENABLE_LOCALED', - 'dbus-org.freedesktop.locale1.service'], - ['systemd-logind.service', 'ENABLE_LOGIND', - 'multi-user.target.wants/ dbus-org.freedesktop.login1.service'], - ['systemd-machine-id-commit.service', '', - 'sysinit.target.wants/'], - ['systemd-machined.service', 'ENABLE_MACHINED', - 'dbus-org.freedesktop.machine1.service'], - ['systemd-modules-load.service', 'HAVE_KMOD', - 'sysinit.target.wants/'], - ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', - join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], - ['systemd-nspawn@.service', ''], - ['systemd-poweroff.service', ''], - ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], - ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', - 'sysinit.target.wants/'], - ['systemd-reboot.service', ''], - ['systemd-remount-fs.service', '', - 'local-fs.target.wants/'], - ['systemd-rfkill.service', 'ENABLE_RFKILL'], - ['systemd-suspend.service', ''], - ['systemd-sysctl.service', '', - 'sysinit.target.wants/'], - ['systemd-sysusers.service', 'ENABLE_SYSUSERS', - 'sysinit.target.wants/'], - ['systemd-timedated.service', 'ENABLE_TIMEDATED', - 'dbus-org.freedesktop.timedate1.service'], - ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', - join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], - ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], - ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['systemd-tmpfiles-setup.service', 'ENABLE_TMPFILES', - 'sysinit.target.wants/'], - ['systemd-udev-settle.service', ''], - ['systemd-udev-trigger.service', '', - 'sysinit.target.wants/'], - ['systemd-udevd.service', '', - 'sysinit.target.wants/'], - ['systemd-update-done.service', '', - 'sysinit.target.wants/'], - ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', - 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], - ['systemd-update-utmp.service', 'HAVE_UTMP', - 'sysinit.target.wants/'], - ['systemd-user-sessions.service', '', - 'multi-user.target.wants/'], - ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], - ['systemd-volatile-root.service', ''], + ['debug-shell.service', ''], + ['emergency.service', ''], + ['halt-local.service', 'HAVE_SYSV_COMPAT'], + ['initrd-cleanup.service', ''], + ['initrd-parse-etc.service', ''], + ['initrd-switch-root.service', ''], + ['initrd-udevadm-cleanup-db.service', ''], + ['kmod-static-nodes.service', 'HAVE_KMOD ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['quotaon.service', 'ENABLE_QUOTACHECK'], + ['rc-local.service', 'HAVE_SYSV_COMPAT'], + ['rescue.service', ''], + ['system-update-cleanup.service', ''], + ['systemd-ask-password-console.service', ''], + ['systemd-ask-password-wall.service', ''], + ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], + ['systemd-binfmt.service', 'ENABLE_BINFMT', + 'sysinit.target.wants/'], + ['systemd-coredump@.service', 'ENABLE_COREDUMP'], + ['systemd-exit.service', ''], + ['systemd-firstboot.service', 'ENABLE_FIRSTBOOT', + 'sysinit.target.wants/'], + ['systemd-fsck-root.service', ''], + ['systemd-fsck@.service', ''], + ['systemd-halt.service', ''], + ['systemd-hibernate-resume@.service', 'ENABLE_HIBERNATE'], + ['systemd-hibernate.service', 'ENABLE_HIBERNATE'], + ['systemd-hybrid-sleep.service', 'ENABLE_HIBERNATE'], + ['systemd-hostnamed.service', 'ENABLE_HOSTNAMED', + 'dbus-org.freedesktop.hostname1.service'], + ['systemd-hwdb-update.service', 'ENABLE_HWDB', + 'sysinit.target.wants/'], + ['systemd-importd.service', 'ENABLE_IMPORTD', + 'dbus-org.freedesktop.import1.service'], + ['systemd-initctl.service', ''], + ['systemd-journal-catalog-update.service', '', + 'sysinit.target.wants/'], + ['systemd-journal-flush.service', '', + 'sysinit.target.wants/'], + ['systemd-journal-gatewayd.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-remote.service', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-upload.service', 'ENABLE_REMOTE HAVE_LIBCURL'], + ['systemd-journald.service', '', + 'sysinit.target.wants/'], + ['systemd-kexec.service', ''], + ['systemd-localed.service', 'ENABLE_LOCALED', + 'dbus-org.freedesktop.locale1.service'], + ['systemd-logind.service', 'ENABLE_LOGIND', + 'multi-user.target.wants/ dbus-org.freedesktop.login1.service'], + ['systemd-machine-id-commit.service', '', + 'sysinit.target.wants/'], + ['systemd-machined.service', 'ENABLE_MACHINED', + 'dbus-org.freedesktop.machine1.service'], + ['systemd-modules-load.service', 'HAVE_KMOD', + 'sysinit.target.wants/'], + ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD', + join_paths(pkgsysconfdir, 'system/network-online.target.wants/')], + ['systemd-nspawn@.service', ''], + ['systemd-poweroff.service', ''], + ['systemd-quotacheck.service', 'ENABLE_QUOTACHECK'], + ['systemd-random-seed.service', 'ENABLE_RANDOMSEED', + 'sysinit.target.wants/'], + ['systemd-reboot.service', ''], + ['systemd-remount-fs.service', '', + 'local-fs.target.wants/'], + ['systemd-rfkill.service', 'ENABLE_RFKILL'], + ['systemd-suspend.service', ''], + ['systemd-sysctl.service', '', + 'sysinit.target.wants/'], + ['systemd-sysusers.service', 'ENABLE_SYSUSERS', + 'sysinit.target.wants/'], + ['systemd-timedated.service', 'ENABLE_TIMEDATED', + 'dbus-org.freedesktop.timedate1.service'], + ['systemd-timesyncd.service', 'ENABLE_TIMESYNCD', + join_paths(pkgsysconfdir, 'system/sysinit.target.wants/')], + ['systemd-tmpfiles-clean.service', 'ENABLE_TMPFILES'], + ['systemd-tmpfiles-setup-dev.service', 'ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['systemd-tmpfiles-setup.service', 'ENABLE_TMPFILES', + 'sysinit.target.wants/'], + ['systemd-udev-settle.service', ''], + ['systemd-udev-trigger.service', '', + 'sysinit.target.wants/'], + ['systemd-udevd.service', '', + 'sysinit.target.wants/'], + ['systemd-update-done.service', '', + 'sysinit.target.wants/'], + ['systemd-update-utmp-runlevel.service', 'HAVE_UTMP HAVE_SYSV_COMPAT', + 'multi-user.target.wants/ graphical.target.wants/ rescue.target.wants/'], + ['systemd-update-utmp.service', 'HAVE_UTMP', + 'sysinit.target.wants/'], + ['systemd-user-sessions.service', '', + 'multi-user.target.wants/'], + ['systemd-vconsole-setup.service', 'ENABLE_VCONSOLE'], + ['systemd-volatile-root.service', ''], ] m4_units = [ - ['getty@.service', '', - 'autovt@.service ' + - join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], - ['serial-getty@.service', ''], - ['tmp.mount', '', - 'local-fs.target.wants/'], + ['getty@.service', '', + 'autovt@.service ' + + join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')], + ['serial-getty@.service', ''], + ['tmp.mount', '', + 'local-fs.target.wants/'], ] m4_in_units = [ - ['console-getty.service', ''], - ['container-getty@.service', ''], - ['systemd-networkd.service', 'ENABLE_NETWORKD', - 'dbus-org.freedesktop.network1.service ' + - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['systemd-resolved.service', 'ENABLE_RESOLVED', - 'dbus-org.freedesktop.resolve1.service ' + - join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], - ['user@.service', ''], + ['console-getty.service', ''], + ['container-getty@.service', ''], + ['systemd-networkd.service', 'ENABLE_NETWORKD', + 'dbus-org.freedesktop.network1.service ' + + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['systemd-resolved.service', 'ENABLE_RESOLVED', + 'dbus-org.freedesktop.resolve1.service ' + + join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')], + ['user@.service', ''], ] foreach tuple : m4_in_units - file = tuple[0] + file = tuple[0] - gen = configure_file( - input : file + '.m4.in', - output : file + '.m4', - configuration : substs) + gen = configure_file( + input : file + '.m4.in', + output : file + '.m4', + configuration : substs) - m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]] + m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]] endforeach foreach tuple : in_units - file = tuple[0] + file = tuple[0] - # we do this here because install_data does not accept custom_target output - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + # we do this here because install_data does not accept custom_target output + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - gen1 = configure_file( - input : file + '.in', - output : file + '.tmp', - configuration : substs) - gen2 = custom_target( - file, - input : gen1, - output : file, - command : [sed, '/^## /d', '@INPUT@'], - capture : true, - install : install, - install_dir : systemunitdir) + gen1 = configure_file( + input : file + '.in', + output : file + '.tmp', + configuration : substs) + gen2 = custom_target( + file, + input : gen1, + output : file, + command : [sed, '/^## /d', '@INPUT@'], + capture : true, + install : install, + install_dir : systemunitdir) - if install and tuple.length() > 2 - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif + if install and tuple.length() > 2 + foreach target : tuple[2].split() + meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif endforeach foreach tuple : m4_units - file = tuple[0] - input = tuple.get(3, file + '.m4') + file = tuple[0] + input = tuple.get(3, file + '.m4') - # we do this here because install_data does not accept custom_target output - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + # we do this here because install_data does not accept custom_target output + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - custom_target( - file, - input : input, - output: file, - command : [m4, '-P'] + m4_defines + ['@INPUT@'], - capture : true, - install : install, - install_dir : systemunitdir) + custom_target( + file, + input : input, + output: file, + command : [m4, '-P'] + m4_defines + ['@INPUT@'], + capture : true, + install : install, + install_dir : systemunitdir) - if tuple.length() > 2 and install - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif + if tuple.length() > 2 and install + foreach target : tuple[2].split() + meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif endforeach foreach tuple : units - file = tuple[0] - input = tuple.get(3, file) + file = tuple[0] + input = tuple.get(3, file) - conds = tuple[1].split(' ') - install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and - (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) + conds = tuple[1].split(' ') + install = ((conds.get(0, '') == '' or conf.get(conds[0], 0) == 1) and + (conds.get(1, '') == '' or conf.get(conds[1], 0) == 1)) - if install - install_data(input, - install_dir : systemunitdir) + if install + install_data(input, + install_dir : systemunitdir) - if tuple.length() > 2 - foreach target : tuple[2].split() - meson.add_install_script('meson-add-wants.sh', systemunitdir, target, file) - endforeach - endif - endif + if tuple.length() > 2 + foreach target : tuple[2].split() + meson.add_install_script( + 'meson-add-wants.sh', systemunitdir, target, file) + endforeach + endif + endif endforeach ############################################################ @@ -319,11 +318,12 @@ meson.add_install_script(meson_make_symlink, join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) if conf.get('HAVE_SYSV_COMPAT', 0) == 1 - foreach i : [1, 2, 3, 4, 5] - meson.add_install_script('sh', '-c', - mkdir_p - .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i)))) - endforeach + foreach i : [1, 2, 3, 4, 5] + meson.add_install_script( + 'sh', '-c', + mkdir_p + .format(join_paths(systemunitdir, 'runlevel@0@.target.wants'.format(i)))) + endforeach endif subdir('user') diff --git a/units/user/meson.build b/units/user/meson.build index f9c73a359a..b507144c05 100644 --- a/units/user/meson.build +++ b/units/user/meson.build @@ -1,36 +1,33 @@ -# -*- mode: meson -*- - units = [ - 'basic.target', - 'bluetooth.target', - 'default.target', - 'exit.target', - 'graphical-session-pre.target', - 'graphical-session.target', - 'paths.target', - 'printer.target', - 'shutdown.target', - 'smartcard.target', - 'sockets.target', - 'sound.target', - 'timers.target', - ] + 'basic.target', + 'bluetooth.target', + 'default.target', + 'exit.target', + 'graphical-session-pre.target', + 'graphical-session.target', + 'paths.target', + 'printer.target', + 'shutdown.target', + 'smartcard.target', + 'sockets.target', + 'sound.target', + 'timers.target', +] foreach file : units - install_data(file, - install_dir : userunitdir) + install_data(file, + install_dir : userunitdir) endforeach - in_units = [ - 'systemd-exit.service', - ] + 'systemd-exit.service', +] foreach file : in_units - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - install_data(gen, - install_dir : userunitdir) + gen = configure_file( + input : file + '.in', + output : file, + configuration : substs) + install_data(gen, + install_dir : userunitdir) endforeach |