From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Wed, 15 Oct 2025 13:03:50 +0000 (+0200)
Subject: Don't fix up vmlinuz locations if not required
X-Git-Tag: v26~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=10544812b35a668d4aac9834c78ee8166e99bc78;p=thirdparty%2Fmkosi.git

Don't fix up vmlinuz locations if not required

If we already have a kernel image for every directory in
/usr/lib/modules then there's no need to do anything.

Fixes #3949
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 6ce57028e..3fd1d4f95 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1309,6 +1309,17 @@ def kernel_get_ver_from_modules(context: Context) -> Optional[str]:
 
 
 def fixup_vmlinuz_location(context: Context) -> None:
+    modulesd = Path("usr/lib/modules")
+
+    if not (context.root / modulesd).exists():
+        return
+
+    # Don't touch anything if all the modules directories contain a kernel image already.
+    if all(
+        (d / "vmlinuz").is_file() or (d / "vmlinux").is_file() for d in (context.root / modulesd).iterdir()
+    ):
+        return
+
     # Some architectures ship an uncompressed vmlinux (ppc64el, riscv64)
     for type in ("vmlinuz", "vmlinux"):
         for d in context.root.glob(f"boot/{type}-*"):