diff --git a/man/rules/meson.build b/man/rules/meson.build index 3265db9c2d..106b80f314 100644 --- 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'], @@ -990,7 +990,7 @@ manpages = [ 'systemd-makefs', 'systemd-mkswap@.service'], ''], - ['systemd-measure', '1', [], 'ENABLE_BOOTLOADER'], + ['systemd-measure', '1', [], ''], ['systemd-modules-load.service', '8', ['systemd-modules-load'], 'HAVE_KMOD'], ['systemd-mount', '1', ['systemd-umount'], ''], ['systemd-network-generator.service', '8', ['systemd-network-generator'], ''], diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build index 24cb785e6b..1588b538d8 100644 --- 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 6703204ec2..ebe79f3985 100644 --- 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 43ff3a5982..55b9bd6294 100644 --- 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, @@ -57,7 +56,6 @@ executables += [ 'name' : 'systemd-measure', 'conditions' : [ 'HAVE_BLKID', - 'ENABLE_BOOTLOADER', 'HAVE_OPENSSL', 'HAVE_TPM2', ], diff --git a/test/meson.build b/test/meson.build index 5579c293a5..b47fa612b1 100644 --- 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',