shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

boot: don't build bootctl when -Dgnu-efi=false is set

Browse Source
This commit is contained in:
Michal Sekletar 2021-08-30 18:38:09 +02:00 committed by Lennart Poettering
parent fa4f366211
commit 3435754559
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
meson.build
View File

@ -1638,6 +1638,10 @@ else
endif
conf.set10('ENABLE_EFI', have)
subdir('src/fundamental')
subdir('src/boot/efi')
conf.set10('HAVE_GNU_EFI', have_gnu_efi)
############################################################
build_bpf_skel_py = find_program('tools/build-bpf-skel.py')
@ -1690,7 +1694,6 @@ includes = [libsystemd_includes, include_directories('src/shared')]
subdir('po')
subdir('catalog')
subdir('src/fundamental')
subdir('src/basic')
subdir('src/libsystemd')
subdir('src/shared')
@ -1827,7 +1830,6 @@ subdir('src/journal')
subdir('src/libsystemd-network')
subdir('src/analyze')
subdir('src/boot/efi')
subdir('src/busctl')
subdir('src/coredump')
subdir('src/cryptenroll')
@ -2221,7 +2223,7 @@ if conf.get('HAVE_PAM') == 1
install_dir : rootlibexecdir)
endif
if conf.get('ENABLE_EFI') == 1 and conf.get('HAVE_BLKID') == 1
if conf.get('HAVE_BLKID') == 1 and conf.get('HAVE_GNU_EFI') == 1
public_programs += executable(
'bootctl',
'src/boot/bootctl.c',

2
shell-completion/bash/meson.build
View File

@ -33,7 +33,7 @@ items = [['busctl', ''],
['systemd-run', ''],
['udevadm', ''],
['kernel-install', ''],
['bootctl', 'ENABLE_EFI'],
['bootctl', 'HAVE_GNU_EFI'],
['coredumpctl', 'ENABLE_COREDUMP'],
['homectl', 'ENABLE_HOMED'],
['hostnamectl', 'ENABLE_HOSTNAMED'],

2
shell-completion/zsh/meson.build
View File

@ -28,7 +28,7 @@ items = [['_busctl', ''],
['_sd_outputmodes', ''],
['_sd_unit_files', ''],
['_sd_machines', ''],
['_bootctl', 'ENABLE_EFI'],
['_bootctl', 'HAVE_GNU_EFI'],
['_coredumpctl', 'ENABLE_COREDUMP'],
['_hostnamectl', 'ENABLE_HOSTNAMED'],
['_localectl', 'ENABLE_LOCALED'],

2
units/meson.build
View File

@ -103,7 +103,7 @@ units = [
['systemd-ask-password-wall.path', '',
'multi-user.target.wants/'],
['systemd-ask-password-wall.service', ''],
['systemd-boot-system-token.service', 'ENABLE_EFI',
['systemd-boot-system-token.service', 'HAVE_GNU_EFI',
'sysinit.target.wants/'],
['systemd-coredump.socket', 'ENABLE_COREDUMP',
'sockets.target.wants/'],