From f96525f73f5ee6d6d55274187ac53f0be526ecc7 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sun, 15 Feb 2009 14:54:05 +0000 Subject: [PATCH] The GCC4 built boot floppy archive is too large, it doesn't fit on a 1.44 image. Therefore we switch to building a 2.88 floppy image in that case so it's at least usable to build a bootable CD. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29211 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/ImageRules | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build/jam/ImageRules b/build/jam/ImageRules index b93bdaf2b7..8679209bdd 100644 --- a/build/jam/ImageRules +++ b/build/jam/ImageRules @@ -1048,6 +1048,14 @@ rule BuildFloppyBootImage image : zbeos : archive Depends $(image) : $(archive) ; #MakeLocateDebug $(image) ; ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; + + # TODO: the GCC4 archive is too large for a 1.44 floppy image + if $(HAIKU_GCC_VERSION[1]) = 2 { + FLOPPY_IMAGE_BLOCK_SIZE on $(image) = 1 ; + } else { + FLOPPY_IMAGE_BLOCK_SIZE on $(image) = 2 ; + } + BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ; } @@ -1055,7 +1063,7 @@ actions BuildFloppyBootImage1 { $(RM) $(<) # make an empty image - dd if=/dev/zero of=$(<) bs=1k count=1440 + dd if=/dev/zero of=$(<) bs=$(FLOPPY_IMAGE_BLOCK_SIZE)k count=1440 # add zbeos dd if=$(>[1]) of=$(<) conv=notrunc # add the boot drivers tgz archive