Skip to content
Snippets Groups Projects
Unverified Commit e6f6edb5 authored by Casey's avatar Casey :recycle:
Browse files

build: package: skip prioritizing deps of pkg which are a subpkg of pkg


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 acc989de
Branches
Tags
No related merge requests found
Pipeline #209056 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.
Please register or to comment