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 c52124f3f83145fde1435f9fe6870aff20e45e30..95d4f6c29ef473ce53f7de19aa70e37489b0e89c 100644 (file)
--- 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():