From 4429c69f8da0c9ea892541a50d5c5f4ac1b42767 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 9 Aug 2017 22:13:41 +0900
Subject: [PATCH] units: do not perform m4 if not necessary (#6575)

---
 units/meson.build                              | 18 +++++++++---------
 ...rvice.m4.in => systemd-networkd.service.in} |  0
 ...rvice.m4.in => systemd-resolved.service.in} |  0
 units/{tmp.mount.m4 => tmp.mount}              |  0
 .../{user@.service.m4.in => user@.service.in}  |  0
 5 files changed, 9 insertions(+), 9 deletions(-)
 rename units/{systemd-networkd.service.m4.in => systemd-networkd.service.in} (100%)
 rename units/{systemd-resolved.service.m4.in => systemd-resolved.service.in} (100%)
 rename units/{tmp.mount.m4 => tmp.mount} (100%)
 rename units/{user@.service.m4.in => user@.service.in} (100%)

diff --git a/units/meson.build b/units/meson.build
index e94add6a6f2..1f579880332 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -99,6 +99,8 @@ units = [
          'sockets.target.wants/'],
         ['time-sync.target',                    ''],
         ['timers.target',                       ''],
+        ['tmp.mount',                           '',
+         'local-fs.target.wants/'],
         ['umount.target',                       ''],
         ['user.slice',                          ''],
         ['var-lib-machines.mount',              'ENABLE_MACHINED',
@@ -161,6 +163,9 @@ in_units = [
          'dbus-org.freedesktop.machine1.service'],
         ['systemd-modules-load.service',         'HAVE_KMOD',
          'sysinit.target.wants/'],
+        ['systemd-networkd.service',             'ENABLE_NETWORKD',
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
+         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD',
          join_paths(pkgsysconfdir, 'system/network-online.target.wants/')],
         ['systemd-nspawn@.service',              ''],
@@ -171,6 +176,9 @@ in_units = [
         ['systemd-reboot.service',               ''],
         ['systemd-remount-fs.service',           '',
          'local-fs.target.wants/'],
+        ['systemd-resolved.service',             'ENABLE_RESOLVED',
+         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
+         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
         ['systemd-rfkill.service',               'ENABLE_RFKILL'],
         ['systemd-suspend.service',              ''],
         ['systemd-sysctl.service',               '',
@@ -201,6 +209,7 @@ in_units = [
          'multi-user.target.wants/'],
         ['systemd-vconsole-setup.service',       'ENABLE_VCONSOLE'],
         ['systemd-volatile-root.service',        ''],
+        ['user@.service',                        ''],
 ]
 
 m4_units = [
@@ -208,20 +217,11 @@ m4_units = [
          'autovt@.service ' +
          join_paths(pkgsysconfdir, 'system/getty.target.wants/getty@tty1.service')],
         ['serial-getty@.service',              ''],
-        ['tmp.mount',                          '',
-         'local-fs.target.wants/'],
 ]
 
 m4_in_units = [
         ['console-getty.service',              ''],
         ['container-getty@.service',           ''],
-        ['systemd-networkd.service',           'ENABLE_NETWORKD',
-         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.network1.service') + ' ' +
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
-        ['systemd-resolved.service',           'ENABLE_RESOLVED',
-         join_paths(pkgsysconfdir, 'system/dbus-org.freedesktop.resolve1.service') + ' ' +
-         join_paths(pkgsysconfdir, 'system/multi-user.target.wants/')],
-        ['user@.service',                      ''],
 ]
 
 foreach tuple : m4_in_units
diff --git a/units/systemd-networkd.service.m4.in b/units/systemd-networkd.service.in
similarity index 100%
rename from units/systemd-networkd.service.m4.in
rename to units/systemd-networkd.service.in
diff --git a/units/systemd-resolved.service.m4.in b/units/systemd-resolved.service.in
similarity index 100%
rename from units/systemd-resolved.service.m4.in
rename to units/systemd-resolved.service.in
diff --git a/units/tmp.mount.m4 b/units/tmp.mount
similarity index 100%
rename from units/tmp.mount.m4
rename to units/tmp.mount
diff --git a/units/user@.service.m4.in b/units/user@.service.in
similarity index 100%
rename from units/user@.service.m4.in
rename to units/user@.service.in