From 8191c5948baaaf666aebb5201adb317026d28912 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 12 Apr 2017 12:36:20 -0400 Subject: [PATCH] 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. --- meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 116325fb7d..7eac7b48fe 100644 --- a/meson.build +++ b/meson.build @@ -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, diff --git a/meson_options.txt b/meson_options.txt index 5b3d37ce9e..653a3a6ec7 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -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',