diff options
| author | Jan Janssen <medhefgo@web.de> | 2023-02-26 14:09:44 +0100 |
|---|---|---|
| committer | Jan Janssen <medhefgo@web.de> | 2023-03-10 11:41:03 +0100 |
| commit | dfca5587cf2032f9ad06041b93b0da5cb39b9989 (patch) | |
| tree | 3998aae5fc6aeea7631dc27aa7fc64310fdc68fa /units | |
| parent | 92148283131474116ed458dbc5966d4b8381e1b3 (diff) | |
| download | systemd-dfca5587cf2032f9ad06041b93b0da5cb39b9989.tar.gz | |
tree-wide: Drop gnu-efi
This drops all mentions of gnu-efi and its manual build machinery. A
future commit will bring bootloader builds back. A new bootloader meson
option is now used to control whether to build sd-boot and its userspace
tooling.
Diffstat (limited to 'units')
| -rw-r--r-- | units/meson.build | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/units/meson.build b/units/meson.build index c7939a10f8..06d68c1d6b 100644 --- a/units/meson.build +++ b/units/meson.build @@ -105,9 +105,9 @@ units = [ ['systemd-ask-password-wall.path', '', 'multi-user.target.wants/'], ['systemd-ask-password-wall.service', ''], - ['systemd-boot-random-seed.service', 'HAVE_GNU_EFI', + ['systemd-boot-random-seed.service', 'ENABLE_BOOTLOADER', 'sysinit.target.wants/'], - ['systemd-boot-update.service', 'HAVE_GNU_EFI'], + ['systemd-boot-update.service', 'ENABLE_BOOTLOADER'], ['systemd-coredump.socket', 'ENABLE_COREDUMP', 'sockets.target.wants/'], ['systemd-exit.service', ''], @@ -187,7 +187,7 @@ in_units = [ ['systemd-backlight@.service', 'ENABLE_BACKLIGHT'], ['systemd-binfmt.service', 'ENABLE_BINFMT', 'sysinit.target.wants/'], - ['systemd-bless-boot.service', 'HAVE_GNU_EFI HAVE_BLKID'], + ['systemd-bless-boot.service', 'ENABLE_BOOTLOADER HAVE_BLKID'], ['systemd-boot-check-no-failures.service', ''], ['systemd-coredump@.service', 'ENABLE_COREDUMP'], ['systemd-pstore.service', 'ENABLE_PSTORE'], @@ -259,16 +259,16 @@ in_units = [ 'sysinit.target.wants/ initrd-root-fs.target.wants/'], ['user-runtime-dir@.service', ''], ['user@.service', ''], - ['systemd-pcrphase-initrd.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2 ENABLE_INITRD', + ['systemd-pcrphase-initrd.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2 ENABLE_INITRD', 'initrd.target.wants/'], - ['systemd-pcrphase-sysinit.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2', + ['systemd-pcrphase-sysinit.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2', 'sysinit.target.wants/'], - ['systemd-pcrphase.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2', + ['systemd-pcrphase.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2', 'sysinit.target.wants/'], - ['systemd-pcrmachine.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2', + ['systemd-pcrmachine.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2', 'sysinit.target.wants/'], - ['systemd-pcrfs-root.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2'], - ['systemd-pcrfs@.service', 'HAVE_GNU_EFI HAVE_OPENSSL HAVE_TPM2'], + ['systemd-pcrfs-root.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2'], + ['systemd-pcrfs@.service', 'ENABLE_BOOTLOADER HAVE_OPENSSL HAVE_TPM2'], ['systemd-growfs-root.service', ''], ['systemd-growfs@.service', ''], ] |