Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't use ExtraSearchPaths= when building default tools tree #3290

Merged
merged 1 commit into from
Dec 20, 2024
Merged

Don't use ExtraSearchPaths= when building default tools tree #3290

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions mkosi/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4156,7 +4156,6 @@ def finalize_default_tools(config: Config, *, resources: Path) -> Config:
"--output=tools",
*(["--source-date-epoch", str(config.source_date_epoch)] if config.source_date_epoch is not None else []), # noqa: E501
*([f"--environment={k}='{v}'" for k, v in config.environment.items()]),
*([f"--extra-search-path={p}" for p in config.extra_search_paths]),
*(["--proxy-url", config.proxy_url] if config.proxy_url else []),
*([f"--proxy-exclude={host}" for host in config.proxy_exclude]),
*(["--proxy-peer-certificate", str(p)] if (p := config.proxy_peer_certificate) else []),
Expand Down Expand Up @@ -4710,16 +4709,15 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
remove_cache_entries(initrd)

if tools and not (tools.output_dir_or_cwd() / tools.output).exists():
with prepend_to_environ_path(tools):
check_tools(tools, Verb.build)
ensure_directories_exist(tools)

with tempfile.TemporaryDirectory(
dir=tools.workspace_dir_or_default(),
prefix="mkosi-metadata-",
) as metadata_dir:
sync_repository_metadata(args, [tools], resources=resources, dst=Path(metadata_dir))
fork_and_wait(run_build, args, tools, resources=resources, metadata_dir=Path(metadata_dir))
check_tools(tools, Verb.build)
ensure_directories_exist(tools)

with tempfile.TemporaryDirectory(
dir=tools.workspace_dir_or_default(),
prefix="mkosi-metadata-",
) as metadata_dir:
sync_repository_metadata(args, [tools], resources=resources, dst=Path(metadata_dir))
fork_and_wait(run_build, args, tools, resources=resources, metadata_dir=Path(metadata_dir))

if not args.verb.needs_build():
with prepend_to_environ_path(last):
Expand Down
Loading