From bb31c819be4f8f5d7d36b33664ca94e4cbf8ab5b Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 11 Apr 2012 10:51:12 -0700 Subject: bootimg: Fix a math thinko in the block count calculation Fixes [YOCTO #1852] ... again. The conversion from sectors to blocks was multiplying by 2 instead of dividing by 2. Blocks are 1024 bytes, sectors are 512 bytes. The result was images being much larger than intended. Reported-by: Tom Zanussi (From OE-Core rev: b35384fa3ca96b31c63d764322215abced2066e4) Signed-off-by: Darren Hart CC: Joshua Lock Signed-off-by: Richard Purdie Backported to edison by Darren Hart. Signed-off-by: Darren Hart Signed-off-by: Richard Purdie --- meta/classes/bootimg.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index c2d43c86ee..489819b815 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -92,7 +92,8 @@ build_boot_bin() { SECTORS=$(expr $SECTORS + $(expr $DIR_SECTORS + $FAT_SECTORS)) # Determine the final size in blocks accounting for some padding - BLOCKS=$(expr $(expr $SECTORS \* 2) + ${BOOTIMG_EXTRA_SPACE}) + BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE}) + # Ensure total sectors is an integral number of sectors per # track or mcopy will complain. Sectors are 512 bytes, and we -- cgit v1.2.3-54-g00ecf