mirror of
https://github.com/systemd/systemd.git
synced 2025-01-21 22:04:01 +03:00
meson: build network-generator unconditionally
The service also generates .link files for udevd.
This commit is contained in:
parent
85e8650827
commit
987dd89c77
@ -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'],
|
||||
|
@ -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>
|
||||
|
28
meson.build
28
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(
|
||||
|
@ -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', ''],
|
||||
|
Loading…
x
Reference in New Issue
Block a user