From 55213e3edbb10c12d0b91f6249293092a861a6db Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Tue, 10 Mar 2020 09:38:01 -0500 Subject: [PATCH] jam/efi: Improve our knowledge of EFI default loader names Change-Id: I7ae941426a10ceac6771ef0a2a53f81d3c3c39d0 Reviewed-on: https://review.haiku-os.org/c/haiku/+/2338 Reviewed-by: Adrien Destugues --- build/jam/ImageRules | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index ff636891bf..be9dfa2f0f 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1638,6 +1638,21 @@ rule BuildEfiSystemPartition image : efiLoader Depends $(image) : $(efiLoader) ; Depends $(image) : $(macVolumeIcon) ; + switch $(TARGET_ARCH) { + case x86_64 : + EFINAME on $(image) = "BOOTX64.EFI" ; + case arm : + EFINAME on $(image) = "BOOTARM.EFI" ; + case arm64 : + EFINAME on $(image) = "BOOTAA64.EFI" ; + case riscv32 : + EFINAME on $(image) = "BOOTRISCV32.EFI" ; + case riscv64 : + EFINAME on $(image) = "BOOTRISCV64.EFI" ; + case * : + Exit "Error: Unknown EFI architecture!" ; + } + EFIICON on $(image) = $(macVolumeIcon) ; BuildEfiSystemPartition1 $(image) : $(efiLoader) ; @@ -1651,5 +1666,5 @@ actions BuildEfiSystemPartition1 mmd -D s -i $(<) ::/EFI mmd -D s -i $(<) ::/EFI/BOOT mcopy -D o -i $(<) $(EFIICON) ::/.VolumeIcon.icns - mcopy -D o -i $(<) $(>) ::/EFI/BOOT/BOOTX64.EFI + mcopy -D o -i $(<) $(>) ::/EFI/BOOT/$(EFINAME) }