From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 19 Jan 2025 22:32:54 +0000 (+0100)
Subject: addon: Don't add initrd section if buildroot is empty
X-Git-Tag: v25~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3386%2Fhead;p=thirdparty%2Fmkosi.git

addon: Don't add initrd section if buildroot is empty
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 18e0312b8..5b3615120 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -2170,17 +2170,21 @@ def make_uki(
 
 
 def make_addon(context: Context, stub: Path, output: Path) -> None:
-    make_cpio(context.root, context.workspace / "initrd", sandbox=context.sandbox)
-    maybe_compress(
-        context,
-        context.config.compress_output,
-        context.workspace / "initrd",
-        context.workspace / "initrd",
-    )
-    arguments: list[PathString] = ["--initrd", workdir(context.workspace / "initrd")]
-    options: list[PathString] = [
-        "--ro-bind", context.workspace / "initrd", workdir(context.workspace / "initrd")
-    ]  # fmt: skip
+    arguments: list[PathString] = []
+    options: list[PathString] = []
+
+    if any(context.root.iterdir()):
+        make_cpio(context.root, context.workspace / "initrd", sandbox=context.sandbox)
+        maybe_compress(
+            context,
+            context.config.compress_output,
+            context.workspace / "initrd",
+            context.workspace / "initrd",
+        )
+        arguments += ["--initrd", workdir(context.workspace / "initrd")]
+        options += [
+            "--ro-bind", context.workspace / "initrd", workdir(context.workspace / "initrd")
+        ]  # fmt: skip
 
     with complete_step(f"Generating PE addon {output}"):
         run_ukify(