boot: don't build bootctl when -Dgnu-efi=false is set

diff --git a/meson.build b/meson.build
index 8d5a1055febf811d049e6154309b020a09e7d84f..8261b131555ca7378032285cfba42e71bb4c9e05 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1638,6 +1638,10 @@ 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')
@@ -1690,7 +1694,6 @@ includes = [libsystemd_includes, include_directories('src/shared')]
 
 subdir('po')
 subdir('catalog')
-subdir('src/fundamental')
 subdir('src/basic')
 subdir('src/libsystemd')
 subdir('src/shared')
@@ -1827,7 +1830,6 @@ subdir('src/journal')
 subdir('src/libsystemd-network')
 
 subdir('src/analyze')
-subdir('src/boot/efi')
 subdir('src/busctl')
 subdir('src/coredump')
 subdir('src/cryptenroll')
@@ -2221,7 +2223,7 @@ if conf.get('HAVE_PAM') == 1
                 install_dir : rootlibexecdir)
 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(
                 'bootctl',
                 'src/boot/bootctl.c',

diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build
index 0946bc5b54302d1be4e7d14b3d8c4c6c80e5a0c7..1196795814e2a464079e681fdb0cbb9c6bdc9a81 100644 (file)
--- a/shell-completion/bash/meson.build
+++ b/shell-completion/bash/meson.build
@@ -33,7 +33,7 @@ items = [['busctl',              ''],
          ['systemd-run',         ''],
          ['udevadm',             ''],
          ['kernel-install',      ''],
-         ['bootctl',             'ENABLE_EFI'],
+         ['bootctl',             'HAVE_GNU_EFI'],
          ['coredumpctl',         'ENABLE_COREDUMP'],
          ['homectl',             'ENABLE_HOMED'],
          ['hostnamectl',         'ENABLE_HOSTNAMED'],

diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build
index ce3a304d45c23954c10ca9b903baa582401493d2..31d9a39ccfc70504cab8e78a1d84ccf4ca22df55 100644 (file)
--- a/shell-completion/zsh/meson.build
+++ b/shell-completion/zsh/meson.build
@@ -28,7 +28,7 @@ items = [['_busctl',                   ''],
          ['_sd_outputmodes',           ''],
          ['_sd_unit_files',            ''],
          ['_sd_machines',              ''],
-         ['_bootctl',                  'ENABLE_EFI'],
+         ['_bootctl',                  'HAVE_GNU_EFI'],
          ['_coredumpctl',              'ENABLE_COREDUMP'],
          ['_hostnamectl',              'ENABLE_HOSTNAMED'],
          ['_localectl',                'ENABLE_LOCALED'],

diff --git a/units/meson.build b/units/meson.build
index 9398df721ea7aba1eb6980dc7c2493a8a4adfc4a..dda57c2a2def99526164dc3c25b4670e331f1f26 100644 (file)
--- a/units/meson.build
+++ b/units/meson.build
@@ -103,7 +103,7 @@ units = [
         ['systemd-ask-password-wall.path',      '',
          'multi-user.target.wants/'],
         ['systemd-ask-password-wall.service',   ''],
-        ['systemd-boot-system-token.service',   'ENABLE_EFI',
+        ['systemd-boot-system-token.service',   'HAVE_GNU_EFI',
          'sysinit.target.wants/'],
         ['systemd-coredump.socket',             'ENABLE_COREDUMP',
          'sockets.target.wants/'],