From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 17 Mar 2024 13:26:36 +0000 (+0100)
Subject: Check whether ukify is available in want_uki()
X-Git-Tag: v23~85^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58cb2cff76bd3e9328e74ff5c3e96be6477c73fe;p=thirdparty%2Fmkosi.git

Check whether ukify is available in want_uki()
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 17e53743f..ef992a52a 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2034,9 +2034,12 @@ def systemd_stub_binary(context: Context) -> Path:
 
 def want_uki(context: Context) -> bool:
     return want_efi(context.config) and (
-        context.config.bootloader == Bootloader.uki or
-        context.config.unified_kernel_images == ConfigFeature.enabled or
-        (context.config.unified_kernel_images == ConfigFeature.auto and systemd_stub_binary(context).exists())
+            context.config.bootloader == Bootloader.uki or
+            context.config.unified_kernel_images == ConfigFeature.enabled or (
+                context.config.unified_kernel_images == ConfigFeature.auto and
+                systemd_stub_binary(context).exists() and
+                find_binary("ukify", "/usr/lib/systemd/ukify", root=context.config.tools()) is not None
+            )
     )