Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert mistaken committed change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39517 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin 2010-11-19 17:17:45 +00:00
parent 5a2f51f20e
commit d01a7e01ed
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
build/jam/ImageRules
View File

@ -1397,19 +1397,20 @@ rule BuildFloppyBootImage image : haikuLoader : archive
actions BuildFloppyBootImage1
{
# haiku_loader_size=`stat -c %s $(>[1])`
# archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
# if [ $haiku_loader_size -gt $archive_image_offset ] ; then
# echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
# echo " before the boot archive starting at $archive_image_offset!"
# exit 1
# fi
haiku_loader_size=`stat -c %s $(>[1])`
archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
if [ $haiku_loader_size -gt $archive_image_offset ] ; then
echo "Error: $(>[1]) is too big ($haiku_loader_size) to fit "
echo " before the boot archive starting at $archive_image_offset!"
exit 1
fi
$(RM) $(<)
# make an empty image
dd if=/dev/zero of=$(<) bs=1k count=$(FLOPPY_IMAGE_SIZE)
# add haiku_loader, then the boot drivers tgz archive
echo "cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc"
cat $(>[1]) $(>[2]) | dd of=$(<) conv=notrunc
# add haiku_loader
dd if=$(>[1]) of=$(<) conv=notrunc
# add the boot drivers tgz archive
dd if=$(>[2]) of=$(<) bs=$(ARCHIVE_IMAGE_OFFSET)k seek=1 conv=notrunc
}
actions BuildFloppyBootImageFixupM68K