make a small change to copy_unsigned_monolithic_grub

This commit is contained in:
michael.hudson@canonical.com 2026-02-19 14:04:31 +13:00
parent 081981e650
commit 6db44c1ea6
No known key found for this signature in database
GPG Key ID: 80E627A0AB757E23

View File

@ -20,14 +20,14 @@ def copy_unsigned_monolithic_grub(
"usr", "usr",
"lib", "lib",
"grub", "grub",
f"{grub_target}-efi", grub_target,
"monolithic", "monolithic",
f"gcd{efi_suffix}.efi", f"gcd{efi_suffix}.efi",
), ),
efi_boot_dir.joinpath(f"boot{efi_suffix}.efi"), efi_boot_dir.joinpath(f"boot{efi_suffix}.efi"),
) )
copy_grub_modules(grub_pkg_dir, iso_root, f"{grub_target}-efi", ["*.mod", "*.lst"]) copy_grub_modules(grub_pkg_dir, iso_root, grub_target, ["*.mod", "*.lst"])
class RISCV64BootConfigurator(GrubBootConfigurator): class RISCV64BootConfigurator(GrubBootConfigurator):
@ -81,7 +81,9 @@ class RISCV64BootConfigurator(GrubBootConfigurator):
# Add GRUB to tree # Add GRUB to tree
copy_grub_common_files(grub_pkg_dir, self.iso_root) copy_grub_common_files(grub_pkg_dir, self.iso_root)
copy_unsigned_monolithic_grub(grub_pkg_dir, "riscv64", "riscv64", self.iso_root) copy_unsigned_monolithic_grub(
grub_pkg_dir, "riscv64", "riscv64-efi", self.iso_root
)
# Extract DTBs to tree # Extract DTBs to tree
self.logger.log("extracting device tree files") self.logger.log("extracting device tree files")