1
0
mirror of https://github.com/systemd/systemd synced 2026-03-28 09:44:50 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Lennart Poettering
f62c5bd152 units: hookup systemd-boot-update.service
It was apparently missed to hook this up in
71c8bf28378958a5ab2348e9ec586fbe78c71dfd.
2021-09-20 19:39:03 +02:00
Michal Sekletar
3435754559 boot: don't build bootctl when -Dgnu-efi=false is set 2021-09-20 17:41:23 +02:00
4 changed files with 9 additions and 6 deletions

View File

@ -1638,6 +1638,10 @@ else
endif endif
conf.set10('ENABLE_EFI', have) 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') 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('po')
subdir('catalog') subdir('catalog')
subdir('src/fundamental')
subdir('src/basic') subdir('src/basic')
subdir('src/libsystemd') subdir('src/libsystemd')
subdir('src/shared') subdir('src/shared')
@ -1827,7 +1830,6 @@ subdir('src/journal')
subdir('src/libsystemd-network') subdir('src/libsystemd-network')
subdir('src/analyze') subdir('src/analyze')
subdir('src/boot/efi')
subdir('src/busctl') subdir('src/busctl')
subdir('src/coredump') subdir('src/coredump')
subdir('src/cryptenroll') subdir('src/cryptenroll')
@ -2221,7 +2223,7 @@ if conf.get('HAVE_PAM') == 1
install_dir : rootlibexecdir) install_dir : rootlibexecdir)
endif 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( public_programs += executable(
'bootctl', 'bootctl',
'src/boot/bootctl.c', 'src/boot/bootctl.c',

View File

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

View File

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

View File

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