Skip to content

Commit edac2c4

Browse files
yuwatapoettering
authored andcommitted
unit,meson: drop .in suffix if no substitution is required (systemd#8740)
1 parent 2341b24 commit edac2c4

File tree

4 files changed

+3
-17
lines changed

4 files changed

+3
-17
lines changed

units/meson.build

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ units = [
7979
['sysinit.target', ''],
8080
['syslog.socket', ''],
8181
['system-update.target', ''],
82+
['system-update-cleanup.service', ''],
8283
['systemd-ask-password-console.path', '',
8384
'sysinit.target.wants/'],
8485
['systemd-ask-password-wall.path', '',
@@ -127,7 +128,6 @@ in_units = [
127128
['quotaon.service', 'ENABLE_QUOTACHECK'],
128129
['rc-local.service', 'HAVE_SYSV_COMPAT'],
129130
['rescue.service', ''],
130-
['system-update-cleanup.service', ''],
131131
['systemd-ask-password-console.service', ''],
132132
['systemd-ask-password-wall.service', ''],
133133
['systemd-backlight@.service', 'ENABLE_BACKLIGHT'],
@@ -222,28 +222,14 @@ in_units = [
222222
]
223223

224224
m4_units = [
225+
['console-getty.service', ''],
226+
['container-getty@.service', ''],
225227
['getty@.service', '',
226228
'autovt@.service ' +
227229
join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')],
228230
['serial-getty@.service', ''],
229231
]
230232

231-
m4_in_units = [
232-
['console-getty.service', ''],
233-
['container-getty@.service', ''],
234-
]
235-
236-
foreach tuple : m4_in_units
237-
file = tuple[0]
238-
239-
gen = configure_file(
240-
input : file + '.m4.in',
241-
output : file + '.m4',
242-
configuration : substs)
243-
244-
m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]]
245-
endforeach
246-
247233
foreach tuple : in_units
248234
file = tuple[0]
249235

0 commit comments

Comments
 (0)