hrev55682 adds 1 changeset to branch 'master'
old head: f5f10a9ec9a9d8686797945ed9c20400346bb538
new head: c5d81c27398aa6b19adef0616163ac667c11f227
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=c5d81c27398a+%5Ef5f10a9ec9a9
----------------------------------------------------------------------------
c5d81c27398a: build: prepare for x86 EFI loader
Change-Id: Ic9e4181042bf634cd590d8c95935a987a4871b0d
Reviewed-on: https://review.haiku-os.org/c/haiku/+/4753
Tested-by: Commit checker robot <no-reply+buildbot@xxxxxxxxxxxx>
Reviewed-by: Jérôme Duval <jerome.duval@xxxxxxxxx>
[ David Karoly <karolyd577@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev55682
Commit: c5d81c27398aa6b19adef0616163ac667c11f227
URL: https://git.haiku-os.org/haiku/commit/?id=c5d81c27398a
Author: David Karoly <karolyd577@xxxxxxxxx>
Date: Wed Dec 1 13:21:25 2021 UTC
Committer: Adrien Destugues <pulkomandy@xxxxxxxxx>
Commit-Date: Thu Dec 2 12:50:25 2021 UTC
----------------------------------------------------------------------------
3 files changed, 6 insertions(+)
build/jam/ImageRules | 2 ++
build/jam/images/MMCImage | 2 ++
src/system/boot/Jamfile | 2 ++
----------------------------------------------------------------------------
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index a3be1dec72..8142be43d0 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1685,6 +1685,8 @@ rule BuildEfiSystemPartition image : efiLoader
Depends $(image) : $(fatshell) ;
switch $(TARGET_ARCH) {
+ case x86 :
+ EFINAME on $(image) = "BOOTIA32.EFI" ;
case x86_64 :
EFINAME on $(image) = "BOOTX64.EFI" ;
case arm :
diff --git a/build/jam/images/MMCImage b/build/jam/images/MMCImage
index a21888a43d..17f037df14 100644
--- a/build/jam/images/MMCImage
+++ b/build/jam/images/MMCImage
@@ -22,6 +22,8 @@ rule BuildSDImage image : files
if $(TARGET_BOOT_PLATFORM) = efi {
switch $(TARGET_ARCH) {
+ case x86 :
+ EFINAME on $(image) = "BOOTIA32.EFI" ;
case x86_64 :
EFINAME on $(image) = "BOOTX64.EFI" ;
case arm :
diff --git a/src/system/boot/Jamfile b/src/system/boot/Jamfile
index de1b8f6b19..663938d16a 100644
--- a/src/system/boot/Jamfile
+++ b/src/system/boot/Jamfile
@@ -107,6 +107,8 @@ rule BuildEFILoader {
Depends $(efiLoader) : $(bootLoader) ;
switch $(TARGET_ARCH) {
+ case x86 :
+ OUTPUT_TARGET on $(efiLoader) = pei-i386 ;
case x86_64 :
OUTPUT_TARGET on $(efiLoader) = pei-x86-64 ;
case arm :
