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

enable EFI boot for 32-bit ISO image

Browse Source 
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 <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
David Karoly
2022-10-06 20:12:05 +00:00
committed by Adrien Destugues
parent 6eff9ae623
commit 05c1a8991e
4 changed files with 5 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ArchitectureRules
-1
View File
@@ -273,7 +273,6 @@ rule KernelArchitectureSetup architecture
case x86 : case x86 :
HAIKU_KERNEL_PLATFORM ?= bios_ia32 ; HAIKU_KERNEL_PLATFORM ?= bios_ia32 ;
HAIKU_BOOT_TARGETS += bios_ia32 efi pxe_ia32 ; HAIKU_BOOT_TARGETS += bios_ia32 efi pxe_ia32 ;
HAIKU_ANYBOOT_LEGACY = 1 ;
HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB
# offset in floppy image (>= sizeof(haiku_loader)) # offset in floppy image (>= sizeof(haiku_loader))
build/jam/ImageRules
+4 -14
View File
@@ -1589,7 +1589,7 @@ actions BuildFloppyBootImageFixupM68K
#pragma mark - CD Boot Image rules #pragma mark - CD Boot Image rules
rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles rule BuildCDBootImageEFI image : bootfloppy : bootefi : extrafiles
{ {
Depends $(image) : $(bootfloppy) ; Depends $(image) : $(bootfloppy) ;
Depends $(image) : $(bootefi) ; Depends $(image) : $(bootefi) ;
@@ -1602,21 +1602,11 @@ rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles
VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ; VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
} }
if $(HAIKU_ANYBOOT_LEGACY) = 1 { BOOTEFI on $(image) = $(bootefi) ;
BuildCDBootImageMBR $(image) : $(bootfloppy) $(extrafiles) ; BuildCDBootImageEFI1 $(image) : $(bootfloppy) $(bootefi) $(extrafiles) ;
} else {
BOOTEFI on $(image) = $(bootefi) ;
BuildCDBootImageEFI $(image) : $(bootfloppy) $(bootefi) $(extrafiles) ;
}
} }
actions BuildCDBootImageMBR actions BuildCDBootImageEFI1
{
$(RM) $(<)
xorriso -as mkisofs -b $(BOOTIMG) -r -J -V $(VOLID) -o $(<) $(>[1]) $(>[2-])
}
actions BuildCDBootImageEFI
{ {
$(RM) $(<) $(RM) $(<)
xorriso -as mkisofs -b $(BOOTIMG) -eltorito-alt-boot -no-emul-boot -e $(BOOTEFI) \ xorriso -as mkisofs -b $(BOOTIMG) -eltorito-alt-boot -no-emul-boot -e $(BOOTEFI) \
build/jam/images/AnybootImage
-18
View File
@@ -4,21 +4,6 @@ HAIKU_ANYBOOT_DIR ?= $(HAIKU_DEFAULT_ANYBOOT_DIR) ;
HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ; HAIKU_ANYBOOT = $(HAIKU_ANYBOOT_NAME) ;
HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ; HAIKU_ANYBOOT_LABEL ?= $(HAIKU_DEFAULT_ANYBOOT_LABEL) ;
rule BuildAnybootImage anybootImage : mbrPart : isoPart : imageFile {
local anyboot = <build>anyboot ;
Depends $(anybootImage) : $(anyboot) ;
Depends $(anybootImage) : $(isoPart) ;
Depends $(anybootImage) : $(mbrPart) ;
Depends $(anybootImage) : $(imageFile) ;
BuildAnybootImage1 $(anybootImage) : $(anyboot) $(mbrPart) $(isoPart) $(imageFile) ;
}
actions BuildAnybootImage1 {
$(2[1]) -b $(2[2]) $(2[3]) $(2[4]) $(1)
}
rule BuildAnybootImageEfi anybootImage : mbrPart : efiPart : isoPart : imageFile { rule BuildAnybootImageEfi anybootImage : mbrPart : efiPart : isoPart : imageFile {
local anyboot = <build>anyboot ; local anyboot = <build>anyboot ;
@@ -55,9 +40,6 @@ for platform in [ MultiBootSubDirSetup ] {
BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR) BuildAnybootImageEfi $(HAIKU_ANYBOOT) : $(baseMBR)
: $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE) : $(efiPartition) : $(HAIKU_CD_BOOT_IMAGE)
: $(HAIKU_IMAGE_NAME) ; : $(HAIKU_IMAGE_NAME) ;
} else if $(HAIKU_ANYBOOT_LEGACY) = 1 {
BuildAnybootImage $(HAIKU_ANYBOOT) : $(baseMBR)
: $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_IMAGE_NAME) ;
} }
} }
} }
build/jam/images/CDBootImage
+1 -5
View File
@@ -38,12 +38,8 @@ if $(TARGET_ARCH) = ppc {
MakeLocateDebug $(efiPartition) : system boot ; MakeLocateDebug $(efiPartition) : system boot ;
BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ; BuildEfiSystemPartition $(efiPartition) : $(efiLoader) ;
BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) BuildCDBootImageEFI $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY)
: $(efiPartition) : $(extras) ; : $(efiPartition) : $(extras) ;
} else if $(HAIKU_ANYBOOT_LEGACY) = 1 {
BuildCDBootImage $(HAIKU_CD_BOOT_IMAGE) : $(HAIKU_BOOT_FLOPPY) :
: $(extras) ;
} }
} }
} }