From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 24 Jun 2024 11:39:37 +0000 (+0200)
Subject: Bump 256~devel version requirements to 256
X-Git-Tag: v24~86^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2802%2Fhead;p=thirdparty%2Fmkosi.git

Bump 256~devel version requirements to 256

Now that 256 is released, let's bump our 256~devel version requirements
to 256.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 3d1b6f7e2..9f87d8dd4 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2167,9 +2167,9 @@ def build_uki(
     if microcodes:
         # new .ucode section support?
         if (
-            systemd_tool_version(context.config, ukify) >= "256~devel" and
+            systemd_tool_version(context.config, ukify) >= "256" and
             (version := systemd_stub_version(context, stub)) and
-            version >= "256~devel"
+            version >= "256"
         ):
             for microcode in microcodes:
                 cmd += ["--microcode", microcode]
@@ -2875,7 +2875,7 @@ def check_tools(config: Config, verb: Verb) -> None:
             check_systemd_tool(
                 config,
                 "ukify", "/usr/lib/systemd/ukify",
-                version="256~devel",
+                version="256",
                 reason="sign Unified Kernel Image with OpenSSL engine",
             )
 
@@ -2883,7 +2883,7 @@ def check_tools(config: Config, verb: Verb) -> None:
                 check_systemd_tool(
                     config,
                     "systemd-measure",
-                    version="256~devel",
+                    version="256",
                     reason="sign PCR hashes with OpenSSL engine",
                 )
 
@@ -2891,7 +2891,7 @@ def check_tools(config: Config, verb: Verb) -> None:
             check_systemd_tool(
                 config,
                 "systemd-repart",
-                version="256~devel",
+                version="256",
                 reason="sign verity roothash signature with OpenSSL engine",
             )
 
@@ -2903,7 +2903,7 @@ def check_tools(config: Config, verb: Verb) -> None:
         check_systemd_tool(config, "systemd-nspawn", version="254", reason="boot images")
 
     if verb == Verb.qemu and config.vmm == Vmm.vmspawn:
-        check_systemd_tool(config, "systemd-vmspawn", version="256~devel", reason="boot images with vmspawn")
+        check_systemd_tool(config, "systemd-vmspawn", version="256", reason="boot images with vmspawn")
 
 
 def configure_ssh(context: Context) -> None: