The bootfloppy image has become so fat that it simply doesn't fit the 1.44 size
anymore. This was the case for GCC4 already but is now also true for GCC2. We might want to look into that again, or we can just ignore it as noone is really using floppies anymore and for eltorito boot we can live with the 2.88 floppy emulation. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30312 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -1057,14 +1057,6 @@ rule BuildFloppyBootImage image : haikuLoader : 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) : $(haikuLoader) $(archive) ;
|
||||
}
|
||||
|
||||
@@ -1072,7 +1064,7 @@ actions BuildFloppyBootImage1
|
||||
{
|
||||
$(RM) $(<)
|
||||
# make an empty image
|
||||
dd if=/dev/zero of=$(<) bs=$(FLOPPY_IMAGE_BLOCK_SIZE)k count=1440
|
||||
dd if=/dev/zero of=$(<) bs=2k count=1440
|
||||
# add haiku_loader
|
||||
dd if=$(>[1]) of=$(<) conv=notrunc
|
||||
# add the boot drivers tgz archive
|
||||
|
||||
Reference in New Issue
Block a user