Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

Revert "pmb.build._package: build depends of subpackages (MR 2292)"

Browse source 
This patch caused a regression[1] that needs to be debugged/fixed, so
reverting in the meantime.

This reverts commit 8b0dfe489a.

1. https://gitlab.com/postmarketOS/pmbootstrap/-/issues/2341
This commit is contained in:
Clayton Craft 2024-04-15 23:29:28 -07:00
parent 8b0dfe489a
commit ca844038f1
No known key found for this signature in database
GPG key ID: 4A4CED6D7EDF950A
2 changed files with 0 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pmb/build/_package.py
View file

@ -113,18 +113,6 @@ def get_depends(args, apkbuild):
ret += apkbuild["checkdepends"]
if "ignore_depends" not in args or not args.ignore_depends:
ret += apkbuild["depends"]
# Add depends of subpackages that are inside pmaports, so pmbootstrap
# builds them too. Otherwise we would get an error that a dependency does
# not exist when trying to install the subpackage (pmb#2084).
for subpkgname, subpkg in apkbuild["subpackages"].items():
if not subpkg:
continue
if not getattr(args, "ignore_depends", False):
for dep in subpkg["depends"]:
if pmb.helpers.pmaports.get(args, dep, False):
ret += [dep]
ret = sorted(set(ret))
# Don't recurse forever when a package depends on itself (#948)