diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-12 12:36:20 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-04-23 21:47:27 -0400 |
| commit | 8191c5948baaaf666aebb5201adb317026d28912 (patch) | |
| tree | 6d6cbbf6a6f2afaa86695752e0344e0e01aa0b05 | |
| parent | f0bd7cc7012190e91183e9ee7649dd423e25629d (diff) | |
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.
| -rw-r--r-- | meson.build | 2 | ||||
| -rw-r--r-- | 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', |