manuel/builder_peppermint_void
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new commit

Browse Source
This commit is contained in:
Manuel 2025-04-25 17:28:23 +00:00
parent e4e3dbbccb
commit deb0e19514
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
builder/core/bootloaders.py
View File

@ -271,6 +271,7 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan
"--", "--",
f"--directory=/usr/lib/grub/{grub_platform}", f"--directory=/usr/lib/grub/{grub_platform}",
f"--format={grub_platform}", f"--format={grub_platform}",
f"--format={grub_platform}",
f"--output={efi_file_tmp_path}", f"--output={efi_file_tmp_path}",
f"boot/grub/grub.cfg" f"boot/grub/grub.cfg"
] ]
@ -307,13 +308,18 @@ def create_grub_efi_boot(architecture, paths, grub_cfg_template_dir, memtest_wan
if arch == "i686": if arch == "i686":
grub_arch = "i386" grub_arch = "i386"
efi_arch = "ia32" efi_arch = "ia32"
grub_platform = "i386-efi"
elif arch == "x86_64": elif arch == "x86_64":
grub_arch = "x86_64" grub_arch = "x86_64"
efi_arch = "x64" efi_arch = "x64"
efi_images[arch] = build_grub_image(architecture, grub_arch, efi_arch) grub_platform = "x86_64-efi"
efi_images[arch] = build_grub_image(architecture, grub_arch, efi_arch, grub_platform)
elif architecture == "aarch64": elif architecture == "aarch64":
build_grub_image(architecture, "arm64", "aa64") grub_platform = "arm64-efi"
build_grub_image(architecture, "arm64", "aa64", grub_platform)
logger.info("=> Copying EFI boot files from efiboot.img to ISO root...") logger.info("=> Copying EFI boot files from efiboot.img to ISO root...")
efi_boot_dest_in_iso = os.path.join(paths['IMAGEDIR'], 'EFI', 'BOOT') efi_boot_dest_in_iso = os.path.join(paths['IMAGEDIR'], 'EFI', 'BOOT')
os.makedirs(efi_boot_dest_in_iso, exist_ok=True) os.makedirs(efi_boot_dest_in_iso, exist_ok=True)