From 54e6c7624f86330036a5bffd20a9400827d90c58 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Sun, 16 May 2021 16:11:04 +0200 Subject: [PATCH] meson: use jinja2 in src/timesync/ --- src/timesync/meson.build | 17 +++++++++-------- src/timesync/timesyncd.conf.in | 2 +- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/timesync/meson.build b/src/timesync/meson.build index 30d2a0caee..ec80b16e82 100644 --- a/src/timesync/meson.build +++ b/src/timesync/meson.build @@ -34,15 +34,16 @@ libtimesyncd_core = static_library( include_directories : includes, link_with : [timesyncd_link_with]) +custom_target( + 'timesyncd.conf', + input : 'timesyncd.conf.in', + output : 'timesyncd.conf', + command : [meson_render_jinja2, config_h, '@INPUT@'], + capture : true, + install : conf.get('ENABLE_TIMESYNCD') == 1 and install_sysconfdir_samples, + install_dir : pkgsysconfdir) + if conf.get('ENABLE_TIMESYNCD') == 1 - timesyncd_conf = configure_file( - input : 'timesyncd.conf.in', - output : 'timesyncd.conf', - configuration : substs) - if install_sysconfdir_samples - install_data(timesyncd_conf, - install_dir : pkgsysconfdir) - endif install_data('org.freedesktop.timesync1.conf', install_dir : dbuspolicydir) install_data('org.freedesktop.timesync1.service', diff --git a/src/timesync/timesyncd.conf.in b/src/timesync/timesyncd.conf.in index 8a2c33e17c..d5f29e1598 100644 --- a/src/timesync/timesyncd.conf.in +++ b/src/timesync/timesyncd.conf.in @@ -14,7 +14,7 @@ [Time] #NTP= -#FallbackNTP=@NTP_SERVERS@ +#FallbackNTP={{NTP_SERVERS}} #RootDistanceMaxSec=5 #PollIntervalMinSec=32 #PollIntervalMaxSec=2048 -- 2.25.1