From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 31 Jan 2026 16:48:18 +0000 (+0100)
Subject: meson: conditionalize tmpfiles.d/legacy.conf
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fcff83a5347679bde1e3bff1398cdc557a432f9d;p=thirdparty%2Fsystemd.git

meson: conditionalize tmpfiles.d/legacy.conf

This is a compat interface, so let downstream like Arch drop it easily.
---

diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build
index 203eb7bb552..7f3fce48c9f 100644
--- a/tmpfiles.d/meson.build
+++ b/tmpfiles.d/meson.build
@@ -4,20 +4,20 @@ if conf.get('ENABLE_TMPFILES') != 1
         subdir_done()
 endif
 
-files = [['README'],
-         ['home.conf'],
-         ['journal-nocow.conf'],
+files = [['README'                                  ],
+         ['home.conf'                               ],
+         ['journal-nocow.conf'                      ],
          ['portables.conf',       'ENABLE_PORTABLED'],
-         ['systemd-network.conf', 'ENABLE_NETWORKD'],
-         ['systemd-nologin.conf', 'HAVE_PAM'],
-         ['systemd-nspawn.conf',  'ENABLE_MACHINED'],
-         ['systemd-pstore.conf',  'ENABLE_PSTORE'],
-         ['systemd-resolve.conf', 'ENABLE_RESOLVE'],
-         ['systemd-tmp.conf'],
-         ['tmp.conf'],
-         ['x11.conf'],
-         ['provision.conf'],
-         ['credstore.conf'],
+         ['systemd-network.conf', 'ENABLE_NETWORKD' ],
+         ['systemd-nologin.conf', 'HAVE_PAM'        ],
+         ['systemd-nspawn.conf',  'ENABLE_MACHINED' ],
+         ['systemd-pstore.conf',  'ENABLE_PSTORE'   ],
+         ['systemd-resolve.conf', 'ENABLE_RESOLVE'  ],
+         ['systemd-tmp.conf'                        ],
+         ['tmp.conf'                                ],
+         ['x11.conf'                                ],
+         ['provision.conf'                          ],
+         ['credstore.conf'                          ],
         ]
 
 foreach f : files
@@ -30,16 +30,16 @@ foreach f : files
 endforeach
 
 in_files = [
-        ['20-systemd-shell-extra.conf',   'LINK_SHELL_EXTRA_DROPIN'],
-        ['20-systemd-osc-context.conf',   'LINK_OSC_CONTEXT_DROPIN'],
-        ['20-systemd-ssh-generator.conf', 'ENABLE_SSH_PROXY_CONFIG'],
-        ['20-systemd-stub.conf',          'ENABLE_EFI'],
-        ['20-systemd-userdb.conf',        'ENABLE_SSH_USERDB_CONFIG'],
-        ['etc.conf'],
-        ['legacy.conf'],
-        ['static-nodes-permissions.conf'],
-        ['systemd.conf'],
-        ['var.conf'],
+        ['20-systemd-shell-extra.conf',   'LINK_SHELL_EXTRA_DROPIN'      ],
+        ['20-systemd-osc-context.conf',   'LINK_OSC_CONTEXT_DROPIN'      ],
+        ['20-systemd-ssh-generator.conf', 'ENABLE_SSH_PROXY_CONFIG'      ],
+        ['20-systemd-stub.conf',          'ENABLE_EFI'                   ],
+        ['20-systemd-userdb.conf',        'ENABLE_SSH_USERDB_CONFIG'     ],
+        ['etc.conf'                                                      ],
+        ['legacy.conf',                   'ENABLE_COMPAT_SYSV_INTERFACES'],
+        ['static-nodes-permissions.conf'                                 ],
+        ['systemd.conf'                                                  ],
+        ['var.conf'                                                      ],
 ]
 
 foreach f : in_files