From dd0f79523f04ea07575af0cdfc218b16e9010110 Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Wed, 15 Apr 2020 17:53:36 +0200 Subject: [PATCH 1/2] Add new meson configure option for controlling systemd-analyze support Enables building systemd without systemd-analyze, which in return saves approx. 4 MB of space upon installing systemd. Signed-off-by: Jakov Smolic Signed-off-by: Luka Perkov --- meson.build | 2 +- meson_options.txt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index bfd708cb4c..8a9f4d08ed 100644 --- a/meson.build +++ b/meson.build @@ -1714,7 +1714,7 @@ exe = executable('systemd-analyze', libmount, libblkid], install_rpath : rootlibexecdir, - install : true) + install : get_option('analyze')) public_programs += exe executable('systemd-journald', diff --git a/meson_options.txt b/meson_options.txt index 30cf147718..5daed21598 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -364,3 +364,5 @@ option('llvm-fuzz', type : 'boolean', value : 'false', description : 'build against LLVM libFuzzer') option('kernel-install', type: 'boolean', value: 'true', description : 'include kernel-install feature') +option('analyze', type: 'boolean', value: 'true', + description : 'include systemd-analyze') From f30bf4d937de4ef69fedc4e73fabe43b8955bed6 Mon Sep 17 00:00:00 2001 From: Jakov Smolic Date: Wed, 15 Apr 2020 17:58:25 +0200 Subject: [PATCH 2/2] Include new configure options in features list Signed-off-by: Jakov Smolic Signed-off-by: Luka Perkov --- meson.build | 2 ++ meson_options.txt | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8a9f4d08ed..209971cc10 100644 --- a/meson.build +++ b/meson.build @@ -3500,6 +3500,8 @@ foreach tuple : [ ['link-systemctl-shared', get_option('link-systemctl-shared')], ['link-networkd-shared', get_option('link-networkd-shared')], ['link-timesyncd-shared', get_option('link-timesyncd-shared')], + ['kernel-install', get_option('kernel-install')], + ['systemd-analyze', get_option('analyze')], ] if tuple.length() >= 2 diff --git a/meson_options.txt b/meson_options.txt index 5daed21598..3526645a59 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -363,6 +363,6 @@ option('oss-fuzz', type : 'boolean', value : 'false', option('llvm-fuzz', type : 'boolean', value : 'false', description : 'build against LLVM libFuzzer') option('kernel-install', type: 'boolean', value: 'true', - description : 'include kernel-install feature') + description : 'install kernel-install and associated files') option('analyze', type: 'boolean', value: 'true', - description : 'include systemd-analyze') + description : 'install systemd-analyze')