packages, chroot: make sure chroots are initialised and /prebuilts is mounted

This commit is contained in:
InsanePrawn 2022-01-29 07:51:38 +01:00
parent 6bc3d36b11
commit 190251dd7d
2 changed files with 7 additions and 1 deletions

View file

@ -415,14 +415,15 @@ def setup_build_chroot(
add_kupfer_repos: bool = True,
clean_chroot: bool = False,
) -> Chroot:
init_prebuilts(arch)
chroot = get_build_chroot(arch, add_kupfer_repos=add_kupfer_repos)
chroot.mount_packages()
logging.info(f'Initializing {arch} build chroot')
chroot.initialize(reset=clean_chroot)
chroot.write_pacman_conf() # in case it was initialized with different repos
chroot.activate()
chroot.mount_pacman_cache()
chroot.mount_pkgbuilds()
chroot.mount_packages()
if extra_packages:
chroot.try_install_packages(extra_packages, allow_fail=False)
return chroot
@ -469,6 +470,8 @@ def build_package(
)
cross = foreign_arch and package.mode == 'cross' and enable_crosscompile
target_chroot.initialize()
if cross:
logging.info(f'Cross-compiling {package.path}')
build_root = native_chroot