From: Luca Boccassi <bluca@debian.org>
Date: Wed, 20 Sep 2023 19:58:47 +0000 (+0100)
Subject: meson: relax ukify requirements
X-Git-Tag: v255-rc1~464
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ae3c292e39856901d86eae8aea2e9e16b117f19;p=thirdparty%2Fsystemd.git

meson: relax ukify requirements

Installing ukify.py doesn't require a working UEFI architecture, but
only that the bootloader option is enabled (and python3). On Debian
Arch: all packages (like python scripts) can theorethically be built
on any builder with any architecture, so there's no guarantee that
it will actually be an EFI-enabled architecture to do that package build.

Relax the requirement to check only for the ukify config option.
---

diff --git a/meson.build b/meson.build
index 702eaaf652e..bf25bcba43e 100644
--- a/meson.build
+++ b/meson.build
@@ -1783,9 +1783,7 @@ if have and efi_arch == 'x64' and cc.links('''
         efi_cpu_family_alt = 'x86'
 endif
 
-want_ukify = get_option('ukify').require(
-        python_39 and conf.get('ENABLE_BOOTLOADER') == 1,
-        error_message : 'Python >= 3.9 and -Dbootloader=true required').allowed()
+want_ukify = get_option('ukify').require(python_39, error_message : 'Python >= 3.9 required').allowed()
 conf.set10('ENABLE_UKIFY', want_ukify)
 
 ############################################################