From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 23 Jan 2025 12:07:31 +0000 (+0100)
Subject: Replace all 257~devel versions with 257
X-Git-Tag: v25~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec29006544d3bc7d778d726e2faed019780f593d;p=thirdparty%2Fmkosi.git

Replace all 257~devel versions with 257
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index ae022dddc..5d1dd8763 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2662,7 +2662,7 @@ def check_tools(config: Config, verb: Verb) -> None:
             if config.unified_kernel_image_profiles:
                 check_ukify(
                     config,
-                    version="257~devel",
+                    version="257",
                     reason="build unified kernel image profiles",
                     hint=(
                         "Use ToolsTree=default to download most required tools including ukify automatically"
@@ -2716,7 +2716,7 @@ def check_tools(config: Config, verb: Verb) -> None:
             and config.secure_boot_auto_enroll
             and (
                 not config.find_binary("bootctl")
-                or systemd_tool_version("bootctl", sandbox=config.sandbox) < "257~devel"
+                or systemd_tool_version("bootctl", sandbox=config.sandbox) < "257"
             )
         ):
             check_tool(config, "sbsiglist", reason="set up systemd-boot secure boot auto-enrollment")
@@ -2733,7 +2733,7 @@ def check_tools(config: Config, verb: Verb) -> None:
             config,
             "systemd-sysupdate",
             "/usr/lib/systemd/systemd-sysupdate",
-            version="257~devel",
+            version="257",
             reason="Update the host system with systemd-sysupdate",
         )
 
diff --git a/mkosi/bootloader.py b/mkosi/bootloader.py
index d5af3925f..87a56cc03 100644
--- a/mkosi/bootloader.py
+++ b/mkosi/bootloader.py
@@ -671,7 +671,7 @@ def install_systemd_boot(context: Context) -> None:
     bootctlver = systemd_tool_version("bootctl", sandbox=context.sandbox)
 
     if want_bootctl_auto_enroll := (
-        context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver >= "257~devel"
+        context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver >= "257"
     ):
         cmd += ["--secure-boot-auto-enroll=yes"]
 
@@ -695,7 +695,7 @@ def install_systemd_boot(context: Context) -> None:
                 context.root / shim_second_stage_binary(context),
             )
 
-    if context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver < "257~devel":
+    if context.config.secure_boot and context.config.secure_boot_auto_enroll and bootctlver < "257":
         assert context.config.secure_boot_key
         assert context.config.secure_boot_certificate