From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 3 Sep 2023 11:54:01 +0000 (+0200)
Subject: Only pass extra tools to ukify when not using tools tree
X-Git-Tag: v16~17^2~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42a9e2a73fcac0be8e1cd74d69e11efaf0b89f14;p=thirdparty%2Fmkosi.git

Only pass extra tools to ukify when not using tools tree

If we're using a tools tree, we don't want to use any binaries
specifed in extra search paths as they will very likely be incompatible
with the tools tree being used.
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index c52124f3f..95d4f6c29 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1075,8 +1075,9 @@ def install_unified_kernel(state: MkosiState, partitions: Sequence[Partition]) -
                 "--efi-arch", state.config.architecture.to_efi(),
             ]
 
-            for p in state.config.extra_search_paths:
-                cmd += ["--tools", p]
+            if not state.config.tools_tree:
+                for p in state.config.extra_search_paths:
+                    cmd += ["--tools", p]
 
             uki_config = state.pkgmngr / "etc/kernel/uki.conf"
             if uki_config.exists():