TODO

@@ -22,11 +22,6 @@ Janitorial Clean-ups:
 
 Features:
 
-* systemd-repart: add a switch to factory reset the partition table without
-  immediately applying the new configuration again. i.e. --factory-reset=leave
-  or so. (this is useful to factory reset an image, then putting it into
-  another machine, ensuring that luks key is generated on new machine, not old)
-
 * move logind udev rules to top-level rule.d/ directory
 
 * move multiseat vid/pid matches from logind udev rule to hwdb

meson_options.txt

@@ -362,7 +362,7 @@ option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],
        description : 'gnu-efi support for sd-boot')
 option('efi-cc', type : 'array',
        description : 'the compiler to use for EFI modules')
-option('efi-ld', type : 'string', value : 'ld',
+option('efi-ld', type : 'string',
        description : 'the linker to use for EFI modules')
 option('efi-libdir', type : 'string',
        description : 'path to the EFI lib directory')

src/boot/efi/meson.build

@@ -45,12 +45,14 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
         if efi_cc.length() == 0
                 efi_cc = cc.cmd_array()
         endif
+        efi_ld = get_option('efi-ld').to_lower()
+        if efi_ld == ''
+                efi_ld = find_program('ld', required: true)
+        endif
 
-        efi_ld = find_program(get_option('efi-ld'), required: true)
+        if efi_ld == 'lld' or efi_ld == 'ld.lld'
-        efi_ld_name = efi_ld.path().split('/')[-1]
+# LLVM/LLD does not support PE/COFF relocations
-        if efi_ld_name == 'lld' or efi_ld_name == 'ld.lld'
+# https://lists.llvm.org/pipermail/llvm-dev/2021-March/149234.html
-                # LLVM/LLD does not support PE/COFF relocations
-                # https://lists.llvm.org/pipermail/llvm-dev/2021-March/149234.html
                 error('LLVM/lld does not support PE/COFF relocations. Use different linker for EFI image.')
         endif