From e1650b8ae898934ddf463d01db20bc029efcadb4 Mon Sep 17 00:00:00 2001
From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 16 Dec 2021 01:51:22 +0900
Subject: [PATCH] meson: build network-generator unconditionally

The service also generates .link files for udevd.

(cherry picked from commit 987dd89c775815831ae21736fe60aef59cb7a6fa)
(cherry picked from commit 02826ab56115ee6bd3a1ad1162c1a3b99dd6538b)
---
 man/rules/meson.build                     |  5 +---
 man/systemd-network-generator.service.xml |  2 +-
 meson.build                               | 28 +++++++++++------------
 units/meson.build                         |  2 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 7ef26cb2c6..0200cc0873 100644
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -908,10 +908,7 @@ manpages = [
   ''],
  ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'],
  ['systemd-mount', '1', ['systemd-umount'], ''],
- ['systemd-network-generator.service',
-  '8',
-  ['systemd-network-generator'],
-  'ENABLE_NETWORKD'],
+ ['systemd-network-generator.service', '8', ['systemd-network-generator'], ''],
  ['systemd-networkd-wait-online.service',
   '8',
   ['systemd-networkd-wait-online'],
diff --git a/man/systemd-network-generator.service.xml b/man/systemd-network-generator.service.xml
index 67567c4099..99a032179e 100644
--- a/man/systemd-network-generator.service.xml
+++ b/man/systemd-network-generator.service.xml
@@ -3,7 +3,7 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
-<refentry id="systemd-network-generator.service" conditional='ENABLE_NETWORKD'>
+<refentry id="systemd-network-generator.service">
 
   <refentryinfo>
     <title>systemd-network-generator.service</title>
diff --git a/meson.build b/meson.build
index 034997a7b8..ac5c128b09 100644
--- a/meson.build
+++ b/meson.build
@@ -3280,22 +3280,22 @@ if conf.get('ENABLE_NETWORKD') == 1
                 install_rpath : rootlibexecdir,
                 install : true,
                 install_dir : rootbindir)
+endif
 
-        exe = executable(
-                'systemd-network-generator',
-                network_generator_sources,
-                include_directories : includes,
-                link_with : [networkd_link_with],
-                install_rpath : rootlibexecdir,
-                install : true,
-                install_dir : rootlibexecdir)
+exe = executable(
+        'systemd-network-generator',
+        network_generator_sources,
+        include_directories : includes,
+        link_with : [networkd_link_with],
+        install_rpath : rootlibexecdir,
+        install : true,
+        install_dir : rootlibexecdir)
 
-        if want_tests != 'false'
-                test('test-network-generator-conversion',
-                     test_network_generator_conversion_sh,
-                     # https://github.com/mesonbuild/meson/issues/2681
-                     args : exe.full_path())
-        endif
+if want_tests != 'false'
+        test('test-network-generator-conversion',
+             test_network_generator_conversion_sh,
+             # https://github.com/mesonbuild/meson/issues/2681
+             args : exe.full_path())
 endif
 
 executable(
diff --git a/units/meson.build b/units/meson.build
index b793740474..7f43d7f4a3 100644
--- a/units/meson.build
+++ b/units/meson.build
@@ -205,7 +205,7 @@ in_units = [
          'dbus-org.freedesktop.machine1.service'],
         ['systemd-modules-load.service',         'HAVE_KMOD',
          'sysinit.target.wants/'],
-        ['systemd-network-generator.service',    'ENABLE_NETWORKD'],
+        ['systemd-network-generator.service',    ''],
         ['systemd-networkd.service',             'ENABLE_NETWORKD'],
         ['systemd-networkd-wait-online.service', 'ENABLE_NETWORKD'],
         ['systemd-nspawn@.service',              ''],
-- 
2.25.1