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

packages.build_enable_qemu(): fixup for usage without wrapper, drop buildchroot requirement

Browse source
This commit is contained in:
InsanePrawn 2022-08-16 03:24:49 +02:00
parent dd7e1716b8
commit 859b08df6a
1 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/__init__.py
View file

@ -710,14 +710,16 @@ def build_enable_qemu_binfmt(arch: Arch, repo: dict[str, Pkgbuild] = None):
if arch not in ARCHES: if arch not in ARCHES:
raise Exception(f'Unknown architecture "{arch}". Choices: {", ".join(ARCHES)}') raise Exception(f'Unknown architecture "{arch}". Choices: {", ".join(ARCHES)}')
logging.info('Installing qemu-user (building if necessary)') logging.info('Installing qemu-user (building if necessary)')
native = config.runtime['arch']
if arch == native:
return
enforce_wrap() enforce_wrap()
if not repo: if not repo:
repo = discover_packages() repo = discover_packages()
native = config.runtime['arch']
# build qemu-user, binfmt, crossdirect # build qemu-user, binfmt, crossdirect
chroot = setup_build_chroot(native)
build_packages_by_paths( build_packages_by_paths(
['cross/' + pkg for pkg in CROSSDIRECT_PKGS], CROSSDIRECT_PKGS,
native, native,
repo, repo,
try_download=True, try_download=True,
@ -725,7 +727,9 @@ def build_enable_qemu_binfmt(arch: Arch, repo: dict[str, Pkgbuild] = None):
enable_crossdirect=False, enable_crossdirect=False,
enable_ccache=False, enable_ccache=False,
) )
run_root_cmd(['pacman', '-Syy', '--noconfirm', '--needed', '--config', os.path.join(chroot.path, 'etc/pacman.conf')] + QEMU_BINFMT_PKGS) crossrepo = get_kupfer_local(native, in_chroot=False, scan=True).repos['cross'].packages
pkgfiles = [os.path.join(crossrepo[pkg].resolved_url.split('file://')[1]) for pkg in QEMU_BINFMT_PKGS] # type: ignore
run_root_cmd(['pacman', '-U', '--noconfirm', '--needed'] + pkgfiles)
if arch != native: if arch != native:
binfmt_register(arch) binfmt_register(arch)