From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 16 Jan 2024 13:49:20 +0000 (+0100)
Subject: kernel-install: Build microcode initrd
X-Git-Tag: v20.2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2291%2Fhead;p=thirdparty%2Fmkosi.git

kernel-install: Build microcode initrd

Let's make sure we build a microcode initrd as well in the
kernel-install plugin. It's a bit too complicated to reuse
the build_microcode_initrd() function we have already due to
sandboxing so we opt to duplicate it instead.
---

diff --git a/kernel-install/50-mkosi.install b/kernel-install/50-mkosi.install
index ca19fe48f..dd6cf184b 100644
--- a/kernel-install/50-mkosi.install
+++ b/kernel-install/50-mkosi.install
@@ -9,11 +9,13 @@ import tempfile
 from pathlib import Path
 from typing import NamedTuple, Optional
 
+from mkosi.archive import make_cpio
 from mkosi.config import OutputFormat, __version__
 from mkosi.log import die, log_setup
 from mkosi.run import run, uncaught_exception_handler
 from mkosi.tree import copy_tree
 from mkosi.types import PathString
+from mkosi.util import umask
 
 
 class Context(NamedTuple):
@@ -41,6 +43,36 @@ def mandatory_variable(name: str) -> str:
         die(f"${name} must be set in the environment")
 
 
+def build_microcode_initrd(output: Path) -> Optional[Path]:
+    amd = Path("/usr/lib/firmware/amd-ucode")
+    intel = Path("/usr/lib/firmware/intel-ucode")
+
+    if not amd.exists() and not intel.exists():
+        logging.debug("/usr/lib/firmware/{amd-ucode,intel-ucode} not found, not adding microcode initrd")
+        return None
+
+    with tempfile.TemporaryDirectory() as tmp:
+        root = Path(tmp) / "initrd-microcode-root"
+        destdir = root / "kernel/x86/microcode"
+
+        with umask(~0o755):
+            destdir.mkdir(parents=True, exist_ok=True)
+
+        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())
+
+        make_cpio(root, output)
+
+    return output
+
+
 @uncaught_exception_handler()
 def main() -> None:
     log_setup()
@@ -155,6 +187,7 @@ def main() -> None:
 
     if format == OutputFormat.cpio:
         shutil.move(next(context.staging_area.glob("initrd*.cpio*")), context.staging_area / "initrd")
+        build_microcode_initrd(context.staging_area / "microcode")
     else:
         (context.staging_area / f"{output}.vmlinuz").unlink()
         (context.staging_area / f"{output}.initrd").unlink()