diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-16 01:51:22 +0900 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-12-16 01:55:20 +0900 |
| commit | 987dd89c775815831ae21736fe60aef59cb7a6fa (patch) | |
| tree | 8f6a2e27cc0df06e63d6bd504d288b242507d0b3 | |
| parent | 85e865082767c84ea689a74006947693f06b69af (diff) | |
| download | systemd-987dd89c775815831ae21736fe60aef59cb7a6fa.tar.gz | |
meson: build network-generator unconditionally
The service also generates .link files for udevd.
| -rw-r--r-- | man/rules/meson.build | 5 | ||||
| -rw-r--r-- | man/systemd-network-generator.service.xml | 2 | ||||
| -rw-r--r-- | meson.build | 28 | ||||
| -rw-r--r-- | units/meson.build | 2 |
4 files changed, 17 insertions, 20 deletions
diff --git a/man/rules/meson.build b/man/rules/meson.build index 9513d7e059..ca19dc73e7 100644 --- 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 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 94bc49ed63..f885118807 100644 --- 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 903443a85d..a9bf28f6d9 100644 --- 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', ''], |