meson.build

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

shell-completion/bash/meson.build

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

shell-completion/zsh/meson.build

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

units/meson.build

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