From: Laurence Kiln <246209442+LaurenceKiln@users.noreply.github.com>
Date: Thu, 18 Dec 2025 17:00:18 +0000 (+0200)
Subject: Wrap build_microcode_initrd in complete_step
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5bc9138fcac02abbdced74c2481ccd4f3606154;p=thirdparty%2Fmkosi.git

Wrap build_microcode_initrd in complete_step
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 559d6ea4d..a57fec481 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1459,42 +1459,43 @@ def build_microcode_initrd(context: Context) -> list[Path]:
     if not context.config.architecture.is_x86_variant():
         return []
 
-    microcode = context.workspace / "microcode.initrd"
-    if microcode.exists():
-        return [microcode]
+    with complete_step("Building microcode initrd"):
+        microcode = context.workspace / "microcode.initrd"
+        if microcode.exists():
+            return [microcode]
 
-    amd = context.root / "usr/lib/firmware/amd-ucode"
-    intel = context.root / "usr/lib/firmware/intel-ucode"
+        amd = context.root / "usr/lib/firmware/amd-ucode"
+        intel = context.root / "usr/lib/firmware/intel-ucode"
 
-    if not amd.exists() and not intel.exists():
-        logging.warning("/usr/lib/firmware/{amd-ucode,intel-ucode} not found, not adding microcode")
-        return []
-
-    root = context.workspace / "microcode-root"
-    destdir = root / "kernel/x86/microcode"
+        if not amd.exists() and not intel.exists():
+            logging.warning("/usr/lib/firmware/{amd-ucode,intel-ucode} not found, not adding microcode")
+            return []
 
-    with umask(~0o755):
-        destdir.mkdir(parents=True, exist_ok=True)
+        root = context.workspace / "microcode-root"
+        destdir = root / "kernel/x86/microcode"
 
-    if context.config.microcode_host:
-        vendorfile, ucodefile = identify_cpu(context.root)
-        if vendorfile is None or ucodefile is None:
-            logging.warning("Unable to identify CPU for MicrocodeHostonly=")
-            return []
-        with (destdir / vendorfile).open("wb") as f:
-            f.write(ucodefile.read_bytes())
-    else:
-        if amd.exists():
-            with (destdir / "AuthenticAMD.bin").open("wb") as f:
-                for p in amd.iterdir():
-                    f.write(p.read_bytes())
+        with umask(~0o755):
+            destdir.mkdir(parents=True, exist_ok=True)
+
+        if context.config.microcode_host:
+            vendorfile, ucodefile = identify_cpu(context.root)
+            if vendorfile is None or ucodefile is None:
+                logging.warning("Unable to identify CPU for MicrocodeHostonly=")
+                return []
+            with (destdir / vendorfile).open("wb") as f:
+                f.write(ucodefile.read_bytes())
+        else:
+            if amd.exists():
+                with (destdir / "AuthenticAMD.bin").open("wb") as f:
+                    for p in amd.iterdir():
+                        f.write(p.read_bytes())
 
-        if intel.exists():
-            with (destdir / "GenuineIntel.bin").open("wb") as f:
-                for p in intel.iterdir():
-                    f.write(p.read_bytes())
+            if intel.exists():
+                with (destdir / "GenuineIntel.bin").open("wb") as f:
+                    for p in intel.iterdir():
+                        f.write(p.read_bytes())
 
-    make_cpio(root, microcode, sandbox=context.sandbox)
+        make_cpio(root, microcode, sandbox=context.sandbox)
 
     return [microcode]