From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Fri, 29 Nov 2024 08:34:33 +0000 (+0100)
Subject: Fix unified kernel image profiles check
X-Git-Tag: v25~135^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b30b023df4c09932deb048cff5c52f05c42ea32a;p=thirdparty%2Fmkosi.git

Fix unified kernel image profiles check

Turns out we already had this check, so remove the extra one we added
and fix the existing one.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index e0265495c..4cc627cc5 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2579,18 +2579,18 @@ def check_tools(config: Config, verb: Verb) -> None:
         if config.bootable != ConfigFeature.disabled:
             check_tool(config, "depmod", reason="generate kernel module dependencies")
 
-        if want_efi(config) and config.unified_kernel_images == ConfigFeature.enabled:
+        if want_efi(config):
             if config.unified_kernel_image_profiles:
                 check_ukify(
                     config,
-                    version="257",
+                    version="257~devel",
                     reason="build unified kernel image profiles",
                     hint=(
                         "Use ToolsTree=default to download most required tools including ukify "
                         "automatically"
                     ),
                 )
-            else:
+            elif config.unified_kernel_images == ConfigFeature.enabled:
                 check_ukify(
                     config,
                     version="254",
@@ -2624,13 +2624,6 @@ def check_tools(config: Config, verb: Verb) -> None:
                     reason="sign PCR hashes with OpenSSL engine",
                 )
 
-        if config.unified_kernel_image_profiles:
-            check_ukify(
-                config,
-                version="257~devel",
-                reason="add unified kernel image profiles",
-            )
-
         if config.verity_key_source.type != KeySourceType.file:
             check_systemd_tool(
                 config,