From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 23 Apr 2024 12:49:19 +0000 (+0200)
Subject: Support SplitArtifacts= for extension images
X-Git-Tag: v23.1~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efcef5e3d99420d7365c4d3d2328beb3636e897a;p=thirdparty%2Fmkosi.git

Support SplitArtifacts= for extension images
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 59b033717..029ca092b 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -3432,20 +3432,25 @@ def make_esp(context: Context, uki: Path) -> list[Partition]:
 
 
 def make_extension_image(context: Context, output: Path) -> None:
+    r = context.resources / f"repart/definitions/{context.config.output_format}.repart.d"
+
     cmdline: list[PathString] = [
         "systemd-repart",
         "--root=/buildroot",
+        "--json=pretty",
         "--dry-run=no",
         "--no-pager",
         f"--offline={yes_no(context.config.repart_offline)}",
         "--seed", str(context.config.seed) if context.config.seed else "random",
         "--empty=create",
         "--size=auto",
+        "--definitions", r,
         output,
     ]
     mounts = [
         Mount(output.parent, output.parent),
         Mount(context.root, "/buildroot", ro=True),
+        Mount(r, r, ro=True),
     ]
 
     if not context.config.architecture.is_native():
@@ -3464,29 +3469,33 @@ def make_extension_image(context: Context, output: Path) -> None:
         mounts += [Mount(context.config.verity_certificate, context.config.verity_certificate, ro=True)]
     if context.config.sector_size:
         cmdline += ["--sector-size", str(context.config.sector_size)]
-
-    env = {
-        option: value
-        for option, value in context.config.environment.items()
-        if option.startswith("SYSTEMD_REPART_MKFS_OPTIONS_") or option == "SOURCE_DATE_EPOCH"
-    }
+    if context.config.split_artifacts:
+        cmdline += ["--split=yes"]
 
     with complete_step(f"Building {context.config.output_format} extension image"):
-        r = context.resources / f"repart/definitions/{context.config.output_format}.repart.d"
-        mounts += [Mount(r, r, ro=True)]
-        run(
-            cmdline + ["--definitions", r],
-            env=env,
-            sandbox=context.sandbox(
-                binary="systemd-repart",
-                devices=(
-                    not context.config.repart_offline or
-                    context.config.verity_key_source.type != KeySource.Type.file
+        j = json.loads(
+            run(
+                cmdline,
+                stdout=subprocess.PIPE,
+                env=context.config.environment,
+                sandbox=context.sandbox(
+                    binary="systemd-repart",
+                    devices=(
+                        not context.config.repart_offline or
+                        context.config.verity_key_source.type != KeySource.Type.file
+                    ),
+                    mounts=mounts,
                 ),
-                mounts=mounts,
-            ),
+            ).stdout
         )
 
+    logging.debug(json.dumps(j, indent=4))
+
+    if context.config.split_artifacts:
+        for p in (Partition.from_dict(d) for d in j):
+            if p.split_path:
+                maybe_compress(context, context.config.compress_output, p.split_path)
+
 
 def finalize_staging(context: Context) -> None:
     rmtree(*(context.config.output_dir_or_cwd() / f.name for f in context.staging.iterdir()))