parchlinux-mobile/kupferbootstrap
1
0
Fork 1
mirror of https://gitlab.com/kupfer/kupferbootstrap.git synced 2025-02-23 05:35:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages/build: build_package(): respect Pkgbuild.nodeps

Browse source
This commit is contained in:
InsanePrawn 2022-09-20 18:44:02 +02:00
parent 6ddab50e21
commit 103c18a171
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
packages/build.py
View file

@ -462,7 +462,7 @@ 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()))) deps = (list(set(package.depends) - set(package.names()))) if not package.nodeps else []
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
@ -491,12 +491,13 @@ def build_package(
env['PATH'] = f"/usr/lib/ccache:{env['PATH']}" env['PATH'] = f"/usr/lib/ccache:{env['PATH']}"
native_chroot.mount_ccache(user=build_user) native_chroot.mount_ccache(user=build_user)
logging.info('Setting up dependencies for cross-compilation') logging.info('Setting up dependencies for cross-compilation')
# include crossdirect for ccache symlinks and qemu-user if not package.nodeps:
results = native_chroot.try_install_packages(package.depends + CROSSDIRECT_PKGS + [f"{GCC_HOSTSPECS[native_chroot.arch][arch]}-gcc"]) # include crossdirect for ccache symlinks and qemu-user
res_crossdirect = results['crossdirect'] results = native_chroot.try_install_packages(deps + CROSSDIRECT_PKGS + [f"{GCC_HOSTSPECS[native_chroot.arch][arch]}-gcc"])
assert isinstance(res_crossdirect, subprocess.CompletedProcess) res_crossdirect = results['crossdirect']
if res_crossdirect.returncode != 0: assert isinstance(res_crossdirect, subprocess.CompletedProcess)
raise Exception('Unable to install crossdirect') if res_crossdirect.returncode != 0:
raise Exception('Unable to install crossdirect')
# mount foreign arch chroot inside native chroot # mount foreign arch chroot inside native chroot
chroot_relative = os.path.join(CHROOT_PATHS['chroots'], target_chroot.name) chroot_relative = os.path.join(CHROOT_PATHS['chroots'], target_chroot.name)
makepkg_path_absolute = native_chroot.write_makepkg_conf(target_arch=arch, cross_chroot_relative=chroot_relative, cross=True) makepkg_path_absolute = native_chroot.write_makepkg_conf(target_arch=arch, cross_chroot_relative=chroot_relative, cross=True)
@ -516,10 +517,11 @@ def build_package(
env['PATH'] = f"/usr/lib/ccache:{env['PATH']}" env['PATH'] = f"/usr/lib/ccache:{env['PATH']}"
deps += ['ccache'] 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) if not package.nodeps:
failed_deps = [name for name, res in dep_install.items() if res.returncode != 0] # type: ignore[union-attr] dep_install = target_chroot.try_install_packages(deps, allow_fail=False)
if failed_deps: failed_deps = [name for name, res in dep_install.items() if res.returncode != 0] # type: ignore[union-attr]
raise Exception(f'Dependencies failed to install: {failed_deps}') if failed_deps:
raise Exception(f'Dependencies failed to install: {failed_deps}')
if enable_ccache: if enable_ccache:
build_root.mount_ccache(user=build_user) build_root.mount_ccache(user=build_user)