Merge pull request #17549 from yuwata/tiny-fixes

[thirdparty/systemd.git] / tmpfiles.d / meson.build

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index da87ea505695af9df818771ef70c2851809daeda..a41dd3e454c7966a5676c6fa47ea4439c0b8a808 100644 (file)
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -1,10 +1,14 @@
-enable_tmpfiles = conf.get('ENABLE_TMPFILES', false)
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+enable_tmpfiles = conf.get('ENABLE_TMPFILES') == 1
 
 tmpfiles = [['home.conf',            ''],
             ['journal-nocow.conf',   ''],
-            ['systemd-nologin.conf', ''],
-            ['systemd-nspawn.conf',  ''],
-            ['systemd-remote.conf',  'ENABLE_REMOTE'],
+            ['systemd-nologin.conf', 'HAVE_PAM'],
+            ['systemd-nspawn.conf',  'ENABLE_MACHINED'],
+            ['systemd-tmp.conf',     ''],
+            ['portables.conf',       'ENABLE_PORTABLED'],
+            ['systemd-pstore.conf',  'ENABLE_PSTORE'],
             ['tmp.conf',             ''],
             ['x11.conf',             ''],
             ['legacy.conf',          'HAVE_SYSV_COMPAT'],
@@ -13,7 +17,7 @@ tmpfiles = [['home.conf',            ''],
 foreach pair : tmpfiles
         if not enable_tmpfiles
                 # do nothing
-        elif pair[1] == '' or conf.get(pair[1], false)
+        elif pair[1] == '' or conf.get(pair[1]) == 1
                 install_data(pair[0], install_dir : tmpfilesdir)
         else
                 message('Not installing tmpfiles.d/@0@ because @1@ is @2@'
@@ -21,19 +25,34 @@ foreach pair : tmpfiles
         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',
             'systemd.conf',
             'var.conf']
 
 foreach file : m4_files
-        custom_target(
-                'tmpfiles.d/' + file,
-                input : file + '.m4',
-                output: file,
-                command : [m4, '-P'] + m4_defines + ['@INPUT@'],
-                capture : true,
-                install : enable_tmpfiles,
-                install_dir : tmpfilesdir)
+        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
 endforeach
 
 if enable_tmpfiles