05c1a8991e
Building EFI partition for 32-bit anyboot ISO image was disabled in hrev52443 to fix issue #14656. As haiku_loader.efi is now available for the x86 architecture since hrev55917, we can re-enable building EFI system partition for the 32-bit ISO. We can also remove the build rules related to HAIKU_ANYBOOT_LEGACY as it is not used any more. Change-Id: I9c2c272bcd0f9c1a98ee6cea300374dc26b4818d Reviewed-on: https://review.haiku-os.org/c/haiku/+/5716 Reviewed-by: Fredrik Holmqvist <fredrik.holmqvist@gmail.com> Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
55 lines
2.0 KiB
Plaintext
55 lines
2.0 KiB
Plaintext
# Set anyboot file name and directory defaults.
|
|
HAIKU_ANYBOOT_NAME ?= $(HAIKU_DEFAULT_ANYBOOT_NAME) ;
|
|
HAIKU_ANYBOOT_DIR ?= $(HAIKU_DEFAULT_ANYBOOT_DIR) ;
|
|
HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ;
|
|
HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ;
|
|
|
|
rule BuildAnybootImageEfi anybootImage : mbrPart : efiPart : isoPart : imageFile {
|
|
local anyboot = <build>anyboot ;
|
|
|
|
Depends $(anybootImage) : $(anyboot) ;
|
|
Depends $(anybootImage) : $(isoPart) ;
|
|
Depends $(anybootImage) : $(mbrPart) ;
|
|
Depends $(anybootImage) : $(efiPart) ;
|
|
Depends $(anybootImage) : $(imageFile) ;
|
|
|
|
BuildAnybootImageEfi1 $(anybootImage) : $(anyboot) $(mbrPart) $(efiPart) $(isoPart) $(imageFile) ;
|
|
}
|
|
|
|
actions BuildAnybootImageEfi1 {
|
|
$(2[1]) -b $(2[2]) -e $(2[3]) $(2[4]) $(2[5]) $(1)
|
|
}
|
|
|
|
local baseMBR = base_mbr.bin ;
|
|
local mbrSource = [ FDirName $(HAIKU_TOP) src bin writembr mbr.S ] ;
|
|
BuildMBR $(baseMBR) : $(mbrSource) ;
|
|
MakeLocate $(baseMBR) : $(HAIKU_OUTPUT_DIR) ;
|
|
MakeLocate $(HAIKU_ANYBOOT) : $(HAIKU_ANYBOOT_DIR) ;
|
|
|
|
# Currently the Anyboot image is available only for EFI+BIOS or BIOS-only
|
|
# systems. It is not needed for other systems, where usually you can boot
|
|
# the same way from an USB or CD drive, instead of needing completely
|
|
# different layouts.
|
|
for platform in [ MultiBootSubDirSetup ] {
|
|
on $(platform) {
|
|
if $(TARGET_BOOT_PLATFORM) = efi {
|
|
local efiLoader = haiku_loader.efi ;
|
|
local efiPartition = esp.image ;
|
|
MakeLocateDebug $(efiPartition) : system boot ;
|
|
BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
|
|
BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR)
|
|
: $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE)
|
|
: $(HAIKU_IMAGE_NAME) ;
|
|
}
|
|
}
|
|
}
|
|
|
|
# TODO: this one seems to cause the build to fail each other run (caching?)
|
|
#RmTemps $(HAIKU_ANYBOOT) : $(baseMBR) ;
|
|
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_CD_BOOT_IMAGE) ;
|
|
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_IMAGE_NAME) ;
|
|
RmTemps $(HAIKU_ANYBOOT) : $(HAIKU_BOOT_FLOPPY) ;
|
|
|
|
NotFile haiku-anyboot-image ;
|
|
Depends haiku-anyboot-image : $(HAIKU_ANYBOOT) ;
|