shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-14 04:58:28 +03:00
Code

Merge pull request #6670 from fsateler/disable-networkd

Browse Source 
build-sys: don't build networkctl if networkd is disabled
This commit is contained in:
Lennart Poettering 2017-08-29 17:28:06 +02:00 committed by GitHub
commit 7123a951d0
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meson.build
View File

@ -2201,18 +2201,17 @@ if conf.get('ENABLE_NETWORKD', false)
install_rpath : rootlibexecdir,
install : true,
install_dir : rootlibexecdir)
endif
exe = executable('networkctl',
networkctl_sources,
include_directories : includes,
link_with : [libsystemd_network,
exe = executable('networkctl',
networkctl_sources,
include_directories : includes,
link_with : [libsystemd_network,
libshared],
install_rpath : rootlibexecdir,
install : true,
install_dir : rootbindir)
public_programs += [exe]
install_rpath : rootlibexecdir,
install : true,
install_dir : rootbindir)
public_programs += [exe]
endif
############################################################
foreach tuple : tests

2
units/meson.build
View File

@ -88,7 +88,7 @@ units = [
'sockets.target.wants/'],
['systemd-journald.socket', '',
'sockets.target.wants/'],
['systemd-networkd.socket', '',
['systemd-networkd.socket', 'ENABLE_NETWORKD',
join_paths(pkgsysconfdir, 'system/sockets.target.wants/')],
['systemd-rfkill.socket', 'ENABLE_RFKILL'],
['systemd-tmpfiles-clean.timer', '',