i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

jam/efi: Improve our knowledge of EFI default loader names

Browse Source 
Change-Id: I7ae941426a10ceac6771ef0a2a53f81d3c3c39d0
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2338
Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
Alexander von Gluck IV
2020-03-10 14:58:43 +00:00
committed by Alex von Gluck IV
parent a0adb978da
commit 55213e3edb
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+16 -1
View File
@@ -1638,6 +1638,21 @@ rule BuildEfiSystemPartition image : efiLoader
Depends $(image) : $(efiLoader) ; Depends $(image) : $(efiLoader) ;
Depends $(image) : $(macVolumeIcon) ; 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) ; EFIICON on $(image) = $(macVolumeIcon) ;
BuildEfiSystemPartition1 $(image) : $(efiLoader) ; BuildEfiSystemPartition1 $(image) : $(efiLoader) ;
@@ -1651,5 +1666,5 @@ actions BuildEfiSystemPartition1
mmd -D s -i $(<) ::/EFI mmd -D s -i $(<) ::/EFI
mmd -D s -i $(<) ::/EFI/BOOT mmd -D s -i $(<) ::/EFI/BOOT
mcopy -D o -i $(<) $(EFIICON) ::/.VolumeIcon.icns mcopy -D o -i $(<) $(EFIICON) ::/.VolumeIcon.icns
mcopy -D o -i $(<) $(>) ::/EFI/BOOT/BOOTX64.EFI mcopy -D o -i $(<) $(>) ::/EFI/BOOT/$(EFINAME)
} }