From ec073af8e9b5f311c827ea56bed811c345935619 Mon Sep 17 00:00:00 2001 From: Oliver Reiche Date: Sun, 23 Apr 2023 14:20:55 +0200 Subject: bootstrap: Do not prune non-local-deps Dependencies (type archive/zip) that are not required for bootstrapping just are usually marked with the hint "drop", in order to avoid fetching non-required archives. This affects only non-local dependencies, as local dependencies (from the system) will not fetch anything and therefore do not need to be dropped. With this commit, the "drop" hint for declared non-local-deps will be ignored during package builds. In this way, the user can specify dependencies that should not be dropped (despite not strictly required to bootstrap just). Consequently, those dependencies remain in the generated bootstrap configuration, in case the user wants to use this configuration to build other targets, such as just-mr. --- bin/bootstrap.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'bin/bootstrap.py') diff --git a/bin/bootstrap.py b/bin/bootstrap.py index 17cd105d..e235aa0d 100755 --- a/bin/bootstrap.py +++ b/bin/bootstrap.py @@ -294,6 +294,8 @@ def prune_config(*, repos_file, empty_dir): with open(repos_file) as f: repos = json.load(f) for repo in repos["repositories"]: + if repo in NON_LOCAL_DEPS: + continue desc = repos["repositories"][repo] if desc.get("bootstrap", {}).get("drop"): desc["repository"] = {"type": "file", "path": empty_dir} -- cgit v1.2.3