Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

chroot: replace arch.from_chroot_suffix() with chroot.arch (MR 2252)

Browse source 
Another usage of args dropped!

Although the device_arch variable thing is not very ideal...

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-05-24 19:22:35 +02:00 • committed by Oliver Smith
parent 8526631589
commit fa804c9453
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
9 changed files with 29 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pmb/parse/arch.py
View file

@ -14,18 +14,6 @@ def alpine_native():
return machine_type_to_alpine(machine)
def from_chroot_suffix(args: PmbArgs, chroot: Chroot) -> str:
if chroot == Chroot.native():
return pmb.config.arch_native
if chroot.name() == args.device:
return args.deviceinfo["arch"]
if chroot.type == ChrootType.BUILDROOT:
return chroot.name()
raise ValueError(f"Invalid chroot suffix: {chroot}"
" (wrong device chosen in 'init' step?)")
def alpine_to_qemu(arch):
"""
Convert the architecture to the string used in the QEMU packaging.