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

The GCC4 built boot floppy archive is too large, it doesn't fit on a 1.44 image.

Browse Source 
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
This commit is contained in:
Michael Lotz
2009-02-15 14:54:05 +00:00
parent f964cf0772
commit f96525f73f
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/ImageRules
+9 -1
View File
@@ -1048,6 +1048,14 @@ rule BuildFloppyBootImage image : zbeos : archive
Depends $(image) : $(archive) ; Depends $(image) : $(archive) ;
#MakeLocateDebug $(image) ; #MakeLocateDebug $(image) ;
ARCHIVE_IMAGE_OFFSET on $(image) = $(HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET) ; 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) ; BuildFloppyBootImage1 $(image) : $(zbeos) $(archive) ;
} }
@@ -1055,7 +1063,7 @@ actions BuildFloppyBootImage1
{ {
$(RM) $(<) $(RM) $(<)
# make an empty image # 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 # add zbeos
dd if=$(>[1]) of=$(<) conv=notrunc dd if=$(>[1]) of=$(<) conv=notrunc
# add the boot drivers tgz archive # add the boot drivers tgz archive