From dcfe072ad6c7e6c6bc62d26d9c25dcc544317b0c Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Mon, 21 Aug 2017 09:48:41 -0300 Subject: [PATCH 1/2] build-sys: don't build networkctl if networkd is disabled --- meson.build | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/meson.build b/meson.build index 9a8f93f0cf..67df9a4599 100644 --- a/meson.build +++ b/meson.build @@ -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 From a174f618ebd4fad67cfd2af0cf472a548dc09fa7 Mon Sep 17 00:00:00 2001 From: Felipe Sateler Date: Sun, 27 Aug 2017 10:49:10 -0300 Subject: [PATCH 2/2] networkd: do not install the socket when networkd is not enabled --- units/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/meson.build b/units/meson.build index 1f57988033..07b8a9d143 100644 --- a/units/meson.build +++ b/units/meson.build @@ -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', '',