]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Fix unified kernel image profiles check
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 29 Nov 2024 08:34:33 +0000 (09:34 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Fri, 29 Nov 2024 08:34:33 +0000 (09:34 +0100)
Turns out we already had this check, so remove the extra one we added
and fix the existing one.

mkosi/__init__.py

index e0265495c9ada7e77398135f40d06929f494d616..4cc627cc56e015697ac857d6bda5707ae1716cc3 100644 (file)
@@ -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,