[oe-commits] Darren Hart : bootimg: Fix a math thinko in the block count calculation

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: b35384fa3ca96b31c63d764322215abced2066e4
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b35384fa3ca96b31c63d764322215abced2066e4

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Tue Jan 24 21:20:54 2012 -0800

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 <tom.zanussi at intel.com>
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
CC: Joshua Lock <josh at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/classes/bootimg.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index df3ee73..e65bef7 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -133,7 +133,7 @@ build_hddimg() {
 		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