meson: build network-generator unconditionally

The service also generates .link files for udevd.

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 9513d7e05937732d00044dbb9725ad3f17c08d20..ca19dc73e7683ee7cc03378581ee8ff23d458188 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -929,10 +929,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 67567c4099efb8a998591d57e67441cf445bb359..99a032179e629b3a8aeddfe6588189b20ba6ee2f 100644 (file)
--- 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 94bc49ed634dcdcfdaf01a0635b807054a1f3430..f88511880739629ac89c5710a2ba504f6312d4e2 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -3467,22 +3467,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 903443a85df7f7cdbc4cfac7fd3b328083d275fc..a9bf28f6d9dd430f2f538a87632c0747662206dd 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -217,7 +217,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',              ''],