From 52f5df47151208fde582edf616609870ac7a451b Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Tue, 5 Mar 2024 08:52:41 +0100 Subject: [PATCH] Only remove kernel modules when not generating a cached image This allows KernelModulesExclude= to be modified without having to rebuild the cached image every time. Fixes #2458 --- mkosi/__init__.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 52a2ec677..3ea771c1e 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -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], -- 2.47.2