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

packages: ensure all dependencies install successfully in host-mode

Browse source
This commit is contained in:
InsanePrawn 2022-01-29 07:52:16 +01:00
parent 190251dd7d
commit 00c61844e7
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages.py
View file

@ -458,9 +458,10 @@ 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)))
target_chroot = setup_build_chroot( target_chroot = setup_build_chroot(
arch=arch, arch=arch,
extra_packages=(list(set(package.depends) - set(package.names))), extra_packages=deps,
clean_chroot=clean_chroot, clean_chroot=clean_chroot,
) )
native_chroot = target_chroot if not foreign_arch else setup_build_chroot( native_chroot = target_chroot if not foreign_arch else setup_build_chroot(
@ -502,7 +503,12 @@ def build_package(
if enable_ccache: if enable_ccache:
logging.debug('ccache enabled') logging.debug('ccache enabled')
env['PATH'] = f"/usr/lib/ccache:{env['PATH']}" env['PATH'] = f"/usr/lib/ccache:{env['PATH']}"
deps += ['ccache']
logging.debug(('Building for native arch. ' if not foreign_arch else '') + 'Skipping crossdirect.') logging.debug(('Building for native arch. ' if not foreign_arch else '') + 'Skipping crossdirect.')
dep_install = target_chroot.try_install_packages(deps, allow_fail=False)
failed_deps = [name for name, res in dep_install.items() if res.returncode != 0]
if failed_deps:
raise Exception(f'Dependencies failed to install: {failed_deps}')
makepkg_conf_absolute = os.path.join('/', makepkg_conf_path) makepkg_conf_absolute = os.path.join('/', makepkg_conf_path)
setup_sources(package, build_root, makepkg_conf_path=makepkg_conf_absolute) setup_sources(package, build_root, makepkg_conf_path=makepkg_conf_absolute)