meson: Always build bootctl

bootctl is rather useful to have, even if on a system without UEFI,
as it has a number of verbs that are unrelated to UEFI (e.g kernel-identify),
and more importantly, it supports --root to operate on directory trees
(which could be intended to be deployed on UEFI) so let's make sure we
always build it.

diff --git a/man/rules/meson.build b/man/rules/meson.build
index 3265db9c2dc6bb8b4da35b0adb8b328bc604193a..f664901ebb3c1688251161933dd1e447e3ab95c4 100644 (file)
--- a/man/rules/meson.build
+++ b/man/rules/meson.build
@@ -5,7 +5,7 @@
 #     ninja -C build update-man-rules
 manpages = [
 ['binfmt.d', '5', [], 'ENABLE_BINFMT'],
- ['bootctl', '1', [], 'ENABLE_BOOTLOADER'],
+ ['bootctl', '1', [], ''],
  ['bootup', '7', [], ''],
  ['busctl', '1', [], ''],
  ['coredump.conf', '5', ['coredump.conf.d'], 'ENABLE_COREDUMP'],

diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 24cb785e6beb95cff8dcd21a61b1a40413182785..1588b538d817d1d6ca60c0b77c76a9ed9946f5be 100644 (file)
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -31,7 +31,7 @@ items = [['busctl',              ''],
          ['systemd-path',        ''],
          ['systemd-run',         ''],
          ['udevadm',             ''],
-         ['bootctl',             'ENABLE_BOOTLOADER'],
+         ['bootctl',             ''],
          ['coredumpctl',         'ENABLE_COREDUMP'],
          ['homectl',             'ENABLE_HOMED'],
          ['hostnamectl',         'ENABLE_HOSTNAMED'],

diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index 6703204ec242b5e549be4051988fd24c9e4e3afe..ebe79f398547fe0c8d54bbfb4c8b1782d921cc15 100644 (file)
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -27,7 +27,7 @@ items = [['_busctl',                   ''],
          ['_sd_outputmodes',           ''],
          ['_sd_unit_files',            ''],
          ['_sd_machines',              ''],
-         ['_bootctl',                  'ENABLE_BOOTLOADER'],
+         ['_bootctl',                  ''],
          ['_coredumpctl',              'ENABLE_COREDUMP'],
          ['_hostnamectl',              'ENABLE_HOSTNAMED'],
          ['_localectl',                'ENABLE_LOCALED'],

diff --git a/src/boot/meson.build b/src/boot/meson.build
index 43ff3a5982843e69d4f0701d184fdfdc593b679a..c376744a7b734f03dd64662cf7b6c5516300cd93 100644 (file)
--- a/src/boot/meson.build
+++ b/src/boot/meson.build
@@ -27,7 +27,6 @@ executables += [
                 'public' : true,
                 'conditions' : [
                           'HAVE_BLKID',
-                          'ENABLE_BOOTLOADER',
                 ],
                 'sources' : bootctl_sources,
                 'link_with' : boot_link_with,

diff --git a/test/meson.build b/test/meson.build
index 5579c293a59f2f11ba73f705b4f602d2add1ec11..b47fa612b15d13d5d54fcccd49ae4b06ee903da4 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -136,7 +136,7 @@ endif
 
 ############################################################
 
-if want_tests != 'false' and conf.get('HAVE_BLKID') == 1 and conf.get('ENABLE_BOOTLOADER') == 1
+if want_tests != 'false' and conf.get('HAVE_BLKID') == 1
         test_bootctl_json_sh = find_program('test-bootctl-json.sh')
         exe = executables_by_name.get('bootctl')
         test('test-bootctl-json',