]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
initrd: pass through --architecture when parsing config files for kmods
authorLuca Boccassi <luca.boccassi@gmail.com>
Fri, 28 Nov 2025 12:18:09 +0000 (12:18 +0000)
committerLuca Boccassi <luca.boccassi@gmail.com>
Fri, 28 Nov 2025 12:21:47 +0000 (12:21 +0000)
--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

mkosi/__init__.py

index 91fa545f274eb3ab4d1c8fb8c656fbbbe7f80889..69e3fa2c05766e222145dee9e9e25f4b033d0756 100644 (file)
@@ -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())