]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Only remove kernel modules when not generating a cached image 2459/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 5 Mar 2024 07:52:41 +0000 (08:52 +0100)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 5 Mar 2024 07:53:30 +0000 (08:53 +0100)
This allows KernelModulesExclude= to be modified without having to
rebuild the cached image every time.

Fixes #2458

mkosi/__init__.py

index 52a2ec677791fc09c1ccfcaf4a548a25ba690dc4..3ea771c1e7b90b6f2fbdac9f0d9060df13c21c8c 100644 (file)
@@ -2517,13 +2517,14 @@ def run_depmod(context: Context, *, cache: bool = False) -> None:
             if all(m.stat().st_mtime <= mtime for m in modulesd.rglob("*.ko*")):
                 continue
 
-        process_kernel_modules(
-            context.root, kver,
-            include=context.config.kernel_modules_include,
-            exclude=context.config.kernel_modules_exclude,
-            host=context.config.kernel_modules_include_host,
-            sandbox=context.sandbox,
-        )
+        if not cache:
+            process_kernel_modules(
+                context.root, kver,
+                include=context.config.kernel_modules_include,
+                exclude=context.config.kernel_modules_exclude,
+                host=context.config.kernel_modules_include_host,
+                sandbox=context.sandbox,
+            )
 
         with complete_step(f"Running depmod for {kver}"):
             run(["depmod", "--all", "--basedir", context.root, kver],