Skip to content
Snippets Groups Projects
Unverified Commit 1fe7b993 authored by Caleb Connolly's avatar Caleb Connolly :recycle:
Browse files

build: package: queue subpkg depends for base package too (MR 2380)


We handle this correctly for dependencies of the base package but not
the base package itself.... Fix this.

Should avoid duplication here ideally.

Signed-off-by: default avatarCaleb Connolly <caleb@postmarketos.org>
parent e5dc22b8
No related branches found
No related tags found
1 merge request!2380Fix walking subpkg depends for base package
Pipeline #188501 passed
......@@ -264,6 +264,12 @@ def process_package(
if base_build_status.necessary():
queue_build(base_aports, base_apkbuild, base_depends)
# Also traverse subpackage depends, they shouldn't be included in base_depends since they
# aren't needed for building (and can conflict with depends for other subpackages)
depends += sum(
map(lambda sp: sp["depends"] if sp else [], base_apkbuild["subpackages"].values()), []
)
parent = pkgname
while len(depends):
# FIXME: pop(0) is really quite slow!
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment