From 099238525ac733f1a162ef506c7bbee7700ead44 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 13 Jun 2023 17:18:06 +0200 Subject: [PATCH] aportgen: use pmb.build.init_abuild_minimal Use init_abuild_minimal instead of init to avoid installing gcc etc. when generating checksums. This function has been added previously in c6bcb0da ("Speed up 'pmbootstrap checksum'"). Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230613151807.568708-1-ollieparanoid@postmarketos.org%3E --- pmb/aportgen/busybox_static.py | 2 +- pmb/aportgen/grub_efi.py | 2 +- pmb/aportgen/musl.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pmb/aportgen/busybox_static.py b/pmb/aportgen/busybox_static.py index b2d0155b..f7cf6aac 100644 --- a/pmb/aportgen/busybox_static.py +++ b/pmb/aportgen/busybox_static.py @@ -67,7 +67,7 @@ def generate(args, pkgname): handle.write(line[12:].replace(" " * 4, "\t") + "\n") # Generate checksums - pmb.build.init(args) + pmb.build.init_abuild_minimal(args) pmb.chroot.root(args, ["chown", "-R", "pmos:pmos", tempdir]) pmb.chroot.user(args, ["abuild", "checksum"], working_dir=tempdir) pmb.helpers.run.user(args, ["cp", apkbuild_path, f"{args.work}/aportgen"]) diff --git a/pmb/aportgen/grub_efi.py b/pmb/aportgen/grub_efi.py index 36c69b4f..dde5dcfb 100644 --- a/pmb/aportgen/grub_efi.py +++ b/pmb/aportgen/grub_efi.py @@ -57,7 +57,7 @@ def generate(args, pkgname): handle.write(line[12:].replace(" " * 4, "\t") + "\n") # Generate checksums - pmb.build.init(args) + pmb.build.init_abuild_minimal(args) pmb.chroot.root(args, ["chown", "-R", "pmos:pmos", tempdir]) pmb.chroot.user(args, ["abuild", "checksum"], working_dir=tempdir) pmb.helpers.run.user(args, ["cp", apkbuild_path, f"{args.work}/aportgen"]) diff --git a/pmb/aportgen/musl.py b/pmb/aportgen/musl.py index 107b96b0..0a459e4a 100644 --- a/pmb/aportgen/musl.py +++ b/pmb/aportgen/musl.py @@ -93,7 +93,7 @@ def generate(args, pkgname): handle.write(line[12:].replace(" " * 4, "\t") + "\n") # Generate checksums - pmb.build.init(args) + pmb.build.init_abuild_minimal(args) pmb.chroot.root(args, ["chown", "-R", "pmos:pmos", tempdir]) pmb.chroot.user(args, ["abuild", "checksum"], working_dir=tempdir) pmb.helpers.run.user(args, ["cp", apkbuild_path, f"{args.work}/aportgen"])