From af82c63d873bb274e9ac437540bbf87a24c09d63 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 30 Jan 2025 15:24:22 +0100 Subject: [PATCH] Skip files outside of known paths for extension outputs --- mkosi/__init__.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index f5d5c0fd0..51b06ab05 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -185,6 +185,16 @@ def mount_base_trees(context: Context) -> Iterator[None]: rel = p.relative_to(context.root) q = context.workspace / "lower" / rel + if ( + context.config.output_format == OutputFormat.sysext + and not rel.is_relative_to("usr") + and not rel.is_relative_to("opt") + ): + continue + + if context.config.output_format == OutputFormat.confext and not rel.is_relative_to("etc"): + continue + if not q.is_symlink() and not q.exists(): continue -- 2.47.2