From 9bc4cf958a0947b2fd9abb7d9adaf4c5568618c8 Mon Sep 17 00:00:00 2001 From: Manuel Date: Sat, 26 Apr 2025 13:16:32 +0000 Subject: [PATCH] new commit --- builder/core/bootloaders.py | 2 +- builder/core/iso_generator.py | 2 +- builder/core/squashfs.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/core/bootloaders.py b/builder/core/bootloaders.py index 383c57aa..ec1db5e0 100644 --- a/builder/core/bootloaders.py +++ b/builder/core/bootloaders.py @@ -273,7 +273,7 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan f"--format={grub_platform}", f"--output={efi_file_tmp_path}", f"boot/grub/grub.cfg" - ] + ] try: logger.debug(f" => Creating EFI/BOOT directory in: {os.path.join(grub_efi_tmpdir, 'EFI', 'BOOT')}") subprocess.run(["mkdir", "-p", os.path.join(grub_efi_tmpdir, "EFI", "BOOT")], check=True) diff --git a/builder/core/iso_generator.py b/builder/core/iso_generator.py index 7ba7ab3b..33b3d76e 100644 --- a/builder/core/iso_generator.py +++ b/builder/core/iso_generator.py @@ -100,9 +100,9 @@ def iso_generator_main( logging.info("=> Generating ISO image with xorriso...") xorriso_command = [ "xbps-uchroot", - "--", paths['PEPHOSTDIR'], "/usr/bin/xorriso", + "--", "-as", "mkisofs", "-iso-level", "3", "-rock", diff --git a/builder/core/squashfs.py b/builder/core/squashfs.py index ea4b2277..f6f0368e 100644 --- a/builder/core/squashfs.py +++ b/builder/core/squashfs.py @@ -98,9 +98,9 @@ def create_squashfs_image(rootfs_dir, squashfs_output_file, pep_host_dir, logger os.makedirs(output_dir, exist_ok=True) mksquashfs_command = [ "xbps-uchroot", - "--", pep_host_dir, "/usr/bin/mksquashfs", + "--", os.path.join(build_dir, "tmp"), squashfs_output_file, "-comp", "zstd",