picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

meson: disable bootctl without libblkid 

bootctl uses blkid probe functions to find the ESP, hence it's useless without
it. Don't even try to build it if libblkid is unavailable.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-12 12:36:20 -04:00
parent f0bd7cc701
commit 8191c5948b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -1306,7 +1306,7 @@ if conf.get('HAVE_PAM', 0) == 1
install_dir : rootlibexecdir)
endif
if conf.get('ENABLE_EFI', 0) == 1
if conf.get('ENABLE_EFI', 0) == 1 and conf.get('HAVE_BLKID', 0) == 1
executable('bootctl',
'src/boot/bootctl.c',
include_directories : includes,

2
meson_options.txt
View File

@ -36,7 +36,7 @@ option('ldconfig', type : 'boolean',
option('resolve', type : 'boolean',
description : 'systemd-resolved stack')
option('efi', type : 'boolean',
description : 'support for EFI')
description : 'enable systemd-boot and bootctl')
option('environment-d', type : 'boolean',
description : 'support for environment.d')
option('binfmt', type : 'boolean',