diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-05-16 13:35:51 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-05-19 10:24:43 +0900 |
| commit | d924a938fe3dbba360cdbee0201ea9797c5f8bff (patch) | |
| tree | f4a982db4a863fe9e017916df5228f2005b6a89c /tmpfiles.d/meson.build | |
| parent | 645b2b190c1f3d8fcbc17597c1cbd256fad535ec (diff) | |
| download | systemd-d924a938fe3dbba360cdbee0201ea9797c5f8bff.tar.gz | |
meson: use jinja2 for tmpfiles.d templates
HAVE_SMACK_RUN_LABEL was dropped back in 348b44372f36010d48d9a7dda14ef67155753a71,
so one line in etc.conf was not rendered as expected ;(
Checking if names are defined is paying for itself!
Diffstat (limited to 'tmpfiles.d/meson.build')
| -rw-r--r-- | tmpfiles.d/meson.build | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build index d5d4bbc9ea..d449034dba 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build @@ -26,34 +26,20 @@ foreach pair : files endif endforeach -in_files = ['static-nodes-permissions.conf'] - -foreach file : in_files - gen = configure_file( - input : file + '.in', - output : file, - configuration : substs) - if enable_tmpfiles - install_data(gen, - install_dir : tmpfilesdir) - endif -endforeach - -m4_files = ['etc.conf', +in_files = ['etc.conf', + 'static-nodes-permissions.conf', 'systemd.conf', 'var.conf'] -foreach file : m4_files - if enable_tmpfiles - custom_target( - 'tmpfiles.d_' + file, - input : file + '.m4', - output: file, - command : [meson_apply_m4, config_h, '@INPUT@'], - capture : true, - install : true, - install_dir : tmpfilesdir) - endif +foreach file : in_files + custom_target( + file, + input : file + '.in', + output: file, + command : [meson_render_jinja2, config_h, '@INPUT@'], + capture : true, + install : enable_tmpfiles, + install_dir : tmpfilesdir) endforeach if enable_tmpfiles and install_sysconfdir |