diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-05 16:52:44 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-04-05 22:18:31 +0200 |
| commit | 8f04a1ca2bf973e5419c32adca1dcf888e0b263f (patch) | |
| tree | 978baef3c11ea9c87119843b155a47618e5377ca /factory/templates | |
| parent | test: do --help/--version checks for systemd, firstboot, cryptenroll, s-n-w-o (diff) | |
| download | systemd-8f04a1ca2bf973e5419c32adca1dcf888e0b263f.tar.xz systemd-8f04a1ca2bf973e5419c32adca1dcf888e0b263f.zip | |
meson: also allow setting GIT_VERSION via templates
GIT_VERSION is not available as a config.h variable, because it's rendered
into version.h during builds. Let's rework jinja2 rendering to also
parse version.h. No functional change, the new variable is so far unused.
I guess this will make partial rebuilds a bit slower, but it's useful
to be able to use the full version string.
Diffstat (limited to 'factory/templates')
| -rw-r--r-- | factory/templates/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/factory/templates/meson.build b/factory/templates/meson.build index 821f176a74..ece2c644ff 100644 --- a/factory/templates/meson.build +++ b/factory/templates/meson.build @@ -6,6 +6,6 @@ custom_target( 'locale.conf', input : 'locale.conf.in', output : 'locale.conf', - command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'], + command : [jinja2_cmdline, '@INPUT@', '@OUTPUT@'], install : true, install_dir : factory_etc_dir) |