ImageRules: remove dependency on bc
POSIX shell now supports $((expression)) for arithmetic expression evaluation. This removes the need for an external command, which may not be available on the build host. Change-Id: Ibd1342c723c2320d77c4de5b1620be32086daa56 Reviewed-on: https://review.haiku-os.org/c/haiku/+/9238 Reviewed-by: Adrien Destugues <[email protected]> Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
committed by
Adrien Destugues
parent
a76a638355
commit
b31ff5b650
@@ -1545,6 +1545,11 @@ rule BuildFloppyBootImage image : haikuLoader : archive
|
||||
STAT_GET_SIZE = "stat -c %s" ;
|
||||
}
|
||||
|
||||
# The action uses sh arithmetic expressions, which use $().
|
||||
# That would conflict with JAM rules, so we need a variable to insert a literal $ character
|
||||
# in the generated command.
|
||||
DOLLAR = $ ;
|
||||
|
||||
BuildFloppyBootImage1 $(image) : $(haikuLoader) $(archive) ;
|
||||
if $(HAIKU_KERNEL_PLATFORM) = atari_m68k {
|
||||
Depends $(image) : <build>fixup_tos_boot_checksum ;
|
||||
@@ -1563,9 +1568,8 @@ actions BuildFloppyBootImage1
|
||||
haiku_loader_size=`$(STAT_GET_SIZE) "$(>[1])"`
|
||||
drivers_tgz_size=`$(STAT_GET_SIZE) "$(>[2])"`
|
||||
|
||||
archive_image_offset=`echo "$(ARCHIVE_IMAGE_OFFSET) * 1024" | bc`
|
||||
floppy_tgz_size=\
|
||||
`echo "($(FLOPPY_IMAGE_SIZE) - $(ARCHIVE_IMAGE_OFFSET)) * 1024" | bc`
|
||||
archive_image_offset=$(DOLLAR)(($(ARCHIVE_IMAGE_OFFSET) * 1024))
|
||||
floppy_tgz_size=$(DOLLAR)((($(FLOPPY_IMAGE_SIZE) - $(ARCHIVE_IMAGE_OFFSET)) * 1024))
|
||||
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!"
|
||||
|
||||
Reference in New Issue
Block a user