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

helpers: mount: drop args (MR 2252)

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

6
pmb/build/envkernel.py
View file

@ -129,7 +129,7 @@ def run_abuild(args: PmbArgs, pkgname: str, arch: str, apkbuild_path: Path, kbui
# development, making it easy to quickly sideload a new kernel or pmbootstrap
# to create a boot image.
pmb.helpers.mount.bind(args, Path("."), chroot / "mnt/linux")
pmb.helpers.mount.bind(Path("."), chroot / "mnt/linux")
if not os.path.exists(chroot / kbuild_out_source):
raise RuntimeError("No '.output' dir found in your kernel source dir. "
@ -164,7 +164,7 @@ def run_abuild(args: PmbArgs, pkgname: str, arch: str, apkbuild_path: Path, kbui
pmb.chroot.user(args, cmd, working_dir=build_path, env=env)
# Clean up bindmount
pmb.helpers.mount.umount_all(args, chroot / "mnt/linux")
pmb.helpers.mount.umount_all(chroot / "mnt/linux")
# Clean up symlinks
if kbuild_out != "":
@ -211,6 +211,6 @@ def package_kernel(args: PmbArgs):
try:
run_abuild(args, pkgname, arch, apkbuild_path, kbuild_out)
except Exception as e:
pmb.helpers.mount.umount_all(args, Chroot.native() / "mnt/linux")
pmb.helpers.mount.umount_all(Chroot.native() / "mnt/linux")
raise e
pmb.build.other.index_repo(args, arch)