parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

packages/build: exclude package names from dependencies, use pkgbase.names()

Browse source
This commit is contained in:
InsanePrawn 2022-10-07 04:56:39 +02:00
parent e91a8c796c
commit ebd541e039
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
packages/build.py
View file

@ -18,7 +18,7 @@ from distro.distro import get_kupfer_https, get_kupfer_local
from distro.package import RemotePackage from distro.package import RemotePackage
from wrapper import check_programs_wrap, is_wrapped from wrapper import check_programs_wrap, is_wrapped
from .pkgbuild import discover_pkgbuilds, filter_pkgbuilds, Pkgbuild from .pkgbuild import discover_pkgbuilds, filter_pkgbuilds, Pkgbuild, SubPkgbuild
pacman_cmd = [ pacman_cmd = [
'pacman', 'pacman',
@ -461,7 +461,12 @@ def build_package(
makepkg_conf_path = 'etc/makepkg.conf' makepkg_conf_path = 'etc/makepkg.conf'
repo_dir = repo_dir if repo_dir else config.get_path('pkgbuilds') repo_dir = repo_dir if repo_dir else config.get_path('pkgbuilds')
foreign_arch = config.runtime.arch != arch foreign_arch = config.runtime.arch != arch
deps = (list(set(package.depends) - set(package.names()))) if not package.nodeps else [] deps = []
if not package.nodeps:
names = set(package.names())
if isinstance(package, SubPkgbuild):
names |= set(package.pkgbase.names())
deps = list(set(package.depends) - names)
needs_rust = 'rust' in deps needs_rust = 'rust' in deps
logging.info(f"{package.path}: Preparing to build: getting native arch build chroot") logging.info(f"{package.path}: Preparing to build: getting native arch build chroot")
build_root: BuildChroot build_root: BuildChroot