Skip to content
Snippets Groups Projects
Unverified Commit 50321d41 authored by Caleb Connolly's avatar Caleb Connolly :recycle: Committed by Oliver Smith
Browse files

build: package: skip prioritizing deps of pkg which are a subpkg of pkg (MR 2459)


Some packages in aports have their own subpackages in their
dependencies, for some reason. This causes our resolver to assume there
is a cyclical dependency.

Adjust the resolver to safely ignore these dependencies, since they'll
be built as a part of the package that depends on them.

For example, modemmanager depends on libmm-glib which is a subpackage of
modemmanager. Currently to build modemmanager in pmaports it would be
necessary to manually modify the APKBUILD after copying it from aports.
This change avoids that.

Signed-off-by: default avatarCaleb Connolly <caleb@postmarketos.org>
parent 497188eb
No related branches found
No related tags found
1 merge request!2459build: package: skip prioritizing deps of pkg which are a subpkg of pkg
Pipeline #209059 passed
......@@ -276,6 +276,10 @@ def prioritise_build_queue(disarray: list[BuildQueueItem]) -> list[BuildQueueIte
raise NonBugError(f"{item['name']}: dependency not found: {dep}")
dep = dep_data.pkgname
# If the dependency is a subpackage we can safely ignore it
if dep in item["apkbuild"]["subpackages"]:
continue
if dep in all_pkgnames:
unmet_deps.setdefault(item["name"], []).append(dep)
missing_deps = True
......
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