From c5325c66909a6c0983bae25bf1d16780435e5d2e Mon Sep 17 00:00:00 2001 From: Augustin Cavalier Date: Tue, 19 Oct 2021 20:59:26 -0400 Subject: [PATCH] ArchitectureRules: Increase HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET on x86. The bootloader is larger after adding zstd and needs more space now. 384 is the value used already on PPC and SPARC. Fixes generating floppyboot archives for anyboot images following recent changes. --- build/jam/ArchitectureRules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules index af295f2d0f..0a0e28a527 100644 --- a/build/jam/ArchitectureRules +++ b/build/jam/ArchitectureRules @@ -268,7 +268,7 @@ rule KernelArchitectureSetup architecture HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB # offset in floppy image (>= sizeof(haiku_loader)) - HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB + HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 384 ; # in kB # nasm is required for target arch x86 if ! $(HAIKU_NASM) { @@ -293,7 +293,7 @@ rule KernelArchitectureSetup architecture HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 2880 ; # in kB # offset in floppy image (>= sizeof(haiku_loader)) - HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 320 ; # in kB + HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 384 ; # in kB # x86_64 kernel source is under arch/x86. HAIKU_KERNEL_ARCH_DIR = x86 ;