Mirror/pmbootstrap
1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-14 11:59:47 +03:00
Code Issues Wiki Activity

pmb.core.chroot: make type a property (MR 2252)

Browse source 
Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-05-23 02:06:56 +02:00 • committed by Oliver Smith
parent 1d5eda75b5
commit 2d232200f8
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pmb/build/autodetect.py
View file

@ -94,7 +94,7 @@ def crosscompile(args: PmbArgs, apkbuild, arch, suffix: Chroot):
return None return None
if not pmb.parse.arch.cpu_emulation_required(arch): if not pmb.parse.arch.cpu_emulation_required(arch):
return None return None
if suffix.type() == ChrootType.NATIVE: if suffix.type == ChrootType.NATIVE:
return "native" return "native"
if "!pmb:crossdirect" in apkbuild["options"]: if "!pmb:crossdirect" in apkbuild["options"]:
return None return None

2
pmb/chroot/init.py
View file

@ -167,7 +167,7 @@ def init(args: PmbArgs, chroot: Chroot=Chroot.native(), usr_merge=UsrMerge.AUTO,
"add", "alpine-base"]) "add", "alpine-base"])
# Building chroots: create "pmos" user, add symlinks to /home/pmos # Building chroots: create "pmos" user, add symlinks to /home/pmos
if not chroot.type() == ChrootType.ROOTFS: if not chroot.type == ChrootType.ROOTFS:
pmb.chroot.root(args, ["adduser", "-D", "pmos", "-u", pmb.chroot.root(args, ["adduser", "-D", "pmos", "-u",
pmb.config.chroot_uid_user], pmb.config.chroot_uid_user],
chroot, auto_init=False) chroot, auto_init=False)

2
pmb/helpers/frontend.py
View file

@ -161,7 +161,7 @@ def chroot(args: PmbArgs):
# Suffix # Suffix
suffix = _parse_suffix(args) suffix = _parse_suffix(args)
if (args.user and suffix != Chroot.native() and if (args.user and suffix != Chroot.native() and
not suffix.type() == ChrootType.BUILDROOT): not suffix.type == ChrootType.BUILDROOT):
raise RuntimeError("--user is only supported for native or" raise RuntimeError("--user is only supported for native or"
" buildroot_* chroots.") " buildroot_* chroots.")
if args.xauth and suffix != Chroot.native(): if args.xauth and suffix != Chroot.native():

2
pmb/parse/arch.py
View file

@ -19,7 +19,7 @@ def from_chroot_suffix(args: PmbArgs, chroot: Chroot) -> str:
return pmb.config.arch_native return pmb.config.arch_native
if chroot.name() == args.device: if chroot.name() == args.device:
return args.deviceinfo["arch"] return args.deviceinfo["arch"]
if chroot.type() == ChrootType.BUILDROOT: if chroot.type == ChrootType.BUILDROOT:
return chroot.name() return chroot.name()
raise ValueError(f"Invalid chroot suffix: {chroot}" raise ValueError(f"Invalid chroot suffix: {chroot}"