build: preserve correct mode when generating files via jinja2

When using "capture : true" in custom_target()s the mode of the source
file is not preserved when the generated file is not installed and so
needs to be tweaked manually. Switch from output capture to creating the
target file and copy the permissions from the input file.

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

10 files changed, 11 insertions, 22 deletions

diff --git a/src/core/meson.build b/src/core/meson.build
index de7c2ae798..c02543bd06 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -149,8 +149,7 @@ load_fragment_gperf_gperf = custom_target(
         'load-fragment-gperf.gperf',
         input : 'load-fragment-gperf.gperf.in',
         output: 'load-fragment-gperf.gperf',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true)
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'])
 
 load_fragment_gperf_c = custom_target(
         'load-fragment-gperf.c',
@@ -202,8 +201,7 @@ foreach item : in_files
                 file,
                 input : file + '.in',
                 output: file,
-                command : [meson_render_jinja2, config_h, '@INPUT@'],
-                capture : true,
+                command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
                 install : (dir == pkgsysconfdir) ? install_sysconfdir_samples : (dir != 'no'),
                 install_dir : dir)
 endforeach
diff --git a/src/journal-remote/meson.build b/src/journal-remote/meson.build
index 5670d55ec5..54b314552b 100644
--- a/src/journal-remote/meson.build
+++ b/src/journal-remote/meson.build
@@ -54,8 +54,7 @@ foreach tuple : in_files
                 file,
                 input : file + '.in',
                 output: file,
-                command : [meson_render_jinja2, config_h, '@INPUT@'],
-                capture : true,
+                command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
                 install : tuple[1],
                 install_dir : pkgsysconfdir)
 endforeach
diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build
index 02b2cd64b2..6ee78fd195 100644
--- a/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@ -183,8 +183,7 @@ custom_target(
         'libsystemd.pc',
         input : 'libsystemd.pc.in',
         output : 'libsystemd.pc',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : pkgconfiglibdir != 'no',
         install_dir : pkgconfiglibdir)
 
diff --git a/src/libudev/meson.build b/src/libudev/meson.build
index 130374d14f..488ae62480 100644
--- a/src/libudev/meson.build
+++ b/src/libudev/meson.build
@@ -43,8 +43,7 @@ custom_target(
         'libudev.pc',
         input : 'libudev.pc.in',
         output : 'libudev.pc',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : pkgconfiglibdir != 'no',
         install_dir : pkgconfiglibdir)
 
diff --git a/src/login/meson.build b/src/login/meson.build
index da704d238f..a583025a1b 100644
--- a/src/login/meson.build
+++ b/src/login/meson.build
@@ -81,8 +81,7 @@ foreach tuple : in_files
                 file,
                 input : file + '.in',
                 output: file,
-                command : [meson_render_jinja2, config_h, '@INPUT@'],
-                capture : true,
+                command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
                 install : tuple[2] and install,
                 install_dir : dir)
 endforeach
diff --git a/src/resolve/meson.build b/src/resolve/meson.build
index 1f9b8af4f3..c7cb88ac04 100644
--- a/src/resolve/meson.build
+++ b/src/resolve/meson.build
@@ -166,8 +166,7 @@ custom_target(
         'resolved.conf',
         input : 'resolved.conf.in',
         output : 'resolved.conf',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : conf.get('ENABLE_RESOLVE') == 1 and install_sysconfdir_samples,
         install_dir : pkgsysconfdir)
 
diff --git a/src/rpm/meson.build b/src/rpm/meson.build
index 2ad3308cc1..8decb11f3b 100644
--- a/src/rpm/meson.build
+++ b/src/rpm/meson.build
@@ -18,8 +18,7 @@ foreach tuple : in_files
                 file,
                 input : file + '.in',
                 output : file,
-                command : [meson_render_jinja2, config_h, '@INPUT@'],
-                capture : true,
+                command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
                 install : tuple[1],
                 install_dir : tuple.length() > 2 ? tuple[2] : '',
                 install_mode : tuple.length() > 3 ? tuple[3] : false,
diff --git a/src/timesync/meson.build b/src/timesync/meson.build
index ec80b16e82..6d6ddeb285 100644
--- a/src/timesync/meson.build
+++ b/src/timesync/meson.build
@@ -38,8 +38,7 @@ custom_target(
         'timesyncd.conf',
         input : 'timesyncd.conf.in',
         output : 'timesyncd.conf',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : conf.get('ENABLE_TIMESYNCD') == 1 and install_sysconfdir_samples,
         install_dir : pkgsysconfdir)
 
diff --git a/src/udev/meson.build b/src/udev/meson.build
index 3423d6de94..0b692df3d8 100644
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -162,8 +162,7 @@ custom_target(
         'udev.pc',
         input : 'udev.pc.in',
         output : 'udev.pc',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : pkgconfigdatadir != 'no',
         install_dir : pkgconfigdatadir)
 
diff --git a/src/vconsole/meson.build b/src/vconsole/meson.build
index dea4121f1a..eb22358c20 100644
--- a/src/vconsole/meson.build
+++ b/src/vconsole/meson.build
@@ -4,7 +4,6 @@ custom_target(
         '90-vconsole.rules',
         input : '90-vconsole.rules.in',
         output : '90-vconsole.rules',
-        command : [meson_render_jinja2, config_h, '@INPUT@'],
-        capture : true,
+        command : [meson_render_jinja2, config_h, '@INPUT@', '@OUTPUT@'],
         install : conf.get('ENABLE_VCONSOLE') == 1,
         install_dir : udevrulesdir)