From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Fri, 28 Nov 2025 12:18:09 +0000 (+0000)
Subject: initrd: pass through --architecture when parsing config files for kmods
X-Git-Tag: v26~49^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b4b25745ab2eb4e623fbceda6dc4370eae9c618;p=thirdparty%2Fmkosi.git

initrd: pass through --architecture when parsing config files for kmods

--architecture is currently ignored when building the list of
kernel modules, so the native one is used, breaking cross-builds
when there are architecture-specific configs to include modules
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 91fa545f2..69e3fa2c0 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1476,7 +1476,11 @@ def finalize_kernel_modules_include(context: Context, *, include: Sequence[str],
     final = {i for i in include if i not in ("default", "host")}
     if "default" in include:
         with chdir(context.resources / "mkosi-initrd"):
-            _, _, [initrd] = parse_config([], resources=context.resources)
+            # TODO: figure out a way to propagate all relevant settings, not just arch
+            _, _, [initrd] = parse_config(
+                ["--architecture", str(context.config.architecture)],
+                resources=context.resources,
+            )
         final.update(initrd.kernel_modules_include)
     if host or "host" in include:
         final.update(loaded_modules())