From edac2c4716cc9b58c1bfc3cdd7dbd8a4b5b1ce77 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 18 Apr 2018 02:49:10 +0900
Subject: [PATCH] unit,meson: drop .in suffix if no substitution is required
 (#8740)

---
 ...-getty.service.m4.in => console-getty.service.m4} |  0
 ...ty@.service.m4.in => container-getty@.service.m4} |  0
 units/meson.build                                    | 20 +++-----------------
 ...anup.service.in => system-update-cleanup.service} |  0
 4 files changed, 3 insertions(+), 17 deletions(-)
 rename units/{console-getty.service.m4.in => console-getty.service.m4} (100%)
 rename units/{container-getty@.service.m4.in => container-getty@.service.m4} (100%)
 rename units/{system-update-cleanup.service.in => system-update-cleanup.service} (100%)

diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4
similarity index 100%
rename from units/console-getty.service.m4.in
rename to units/console-getty.service.m4
diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4
similarity index 100%
rename from units/container-getty@.service.m4.in
rename to units/container-getty@.service.m4
diff --git a/units/meson.build b/units/meson.build
index dac8feb..5e454ab 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -79,6 +79,7 @@ units = [
         ['sysinit.target',                      ''],
         ['syslog.socket',                       ''],
         ['system-update.target',                ''],
+        ['system-update-cleanup.service',       ''],
         ['systemd-ask-password-console.path',   '',
          'sysinit.target.wants/'],
         ['systemd-ask-password-wall.path',      '',
@@ -127,7 +128,6 @@ in_units = [
         ['quotaon.service',                      'ENABLE_QUOTACHECK'],
         ['rc-local.service',                     'HAVE_SYSV_COMPAT'],
         ['rescue.service',                       ''],
-        ['system-update-cleanup.service',        ''],
         ['systemd-ask-password-console.service', ''],
         ['systemd-ask-password-wall.service',    ''],
         ['systemd-backlight@.service',           'ENABLE_BACKLIGHT'],
@@ -222,28 +222,14 @@ in_units = [
 ]
 
 m4_units = [
+        ['console-getty.service',              ''],
+        ['container-getty@.service',           ''],
         ['getty@.service',                     '',
          'autovt@.service ' +
          join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')],
         ['serial-getty@.service',              ''],
 ]
 
-m4_in_units = [
-        ['console-getty.service',              ''],
-        ['container-getty@.service',           ''],
-]
-
-foreach tuple : m4_in_units
-        file = tuple[0]
-
-        gen = configure_file(
-                input : file + '.m4.in',
-                output : file + '.m4',
-                configuration : substs)
-
-        m4_units += [[file, tuple.get(1, ''), tuple.get(2, ''), gen]]
-endforeach
-
 foreach tuple : in_units
         file = tuple[0]
 
diff --git a/units/system-update-cleanup.service.in b/units/system-update-cleanup.service
similarity index 100%
rename from units/system-update-cleanup.service.in
rename to units/system-update-cleanup.service
-- 
2.7.4