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 /meson_options.txt | |
| parent | meson: Introduce userspace dep (diff) | |
| download | systemd-dfca5587cf2032f9ad06041b93b0da5cb39b9989.tar.xz systemd-dfca5587cf2032f9ad06041b93b0da5cb39b9989.zip | |
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 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/meson_options.txt b/meson_options.txt index 95b1162249..d3af35e7ef 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -93,7 +93,7 @@ option('ldconfig', type : 'boolean', option('resolve', type : 'boolean', description : 'systemd-resolved stack') option('efi', type : 'boolean', - description : 'enable systemd-boot and bootctl') + description : 'enable EFI support') option('tpm', type : 'boolean', description : 'TPM should be used to log events and extend the registers') option('environment-d', type : 'boolean', @@ -436,18 +436,8 @@ option('glib', type : 'combo', choices : ['auto', 'true', 'false'], option('dbus', type : 'combo', choices : ['auto', 'true', 'false'], description : 'libdbus support (for tests only)') -option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], - description : 'gnu-efi support for sd-boot') -option('efi-cflags', type : 'array', - description : 'additional flags for EFI compiler') -# Note that LLD does not support PE/COFF relocations -# https://lists.llvm.org/pipermail/llvm-dev/2021-March/149234.html -option('efi-ld', type : 'combo', choices : ['auto', 'bfd', 'gold'], - description : 'the linker to use for EFI modules') -option('efi-libdir', type : 'string', - description : 'path to the EFI lib directory') -option('efi-includedir', type : 'string', value : '/usr/include/efi', - description : 'path to the EFI header directory') +option('bootloader', type : 'combo', choices : ['auto', 'true', 'false'], + description : 'sd-boot/stub and userspace tools') option('sbat-distro', type : 'string', value : 'auto', description : 'SBAT distribution ID, e.g. fedora, or auto for autodetection') option('sbat-distro-generation', type : 'integer', value : 1, |