bootimg: Use mcopy to construct the hddimg

Fixes [YOCTO 2138]

The initial directory support (-d) added to mkdosfs has proven to be incomplete
and non-compliant with FAT. Rather than continue to maintain this feature and
work around the various issues, we can use mcopy to construct the image.

bootimg.bbclass already depends on mtools-native (although it may not have
needed to previously). No new dependencies are introduced. The image created
passes dosfsck cleanly. Remove the call to dosfsck.

mcopy reported an error with the image we were creating:
Total number of sectors (107574) not a multiple of sectors per track (32)!

Add some logic to ensure the total sector count is an integral number of sectors
per track, including forcing the logical sector size to 512 in the mkdosfs
command.

The du -bks arguments are contradictory, -b is equivalent to "--apparent-size
--block-size=1" and -k is --block-size=1K. If reordered, -kbs will report the
disk usage in bytes insteadk of 1k blocks. Eliminate the ambiguity by using:
du --apparent-size -ks

(From OE-Core rev: 92d2ea1a306354c6565a1b05b51b5719e481840f)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Nitin A. Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Backported to poky edison by Darren Hart.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 15 insertions, 7 deletions

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 49ee85ea72..bcae2aeab1 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -62,13 +62,21 @@ build_boot_bin() {
 
         install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
-        # Do a little math, bash style
-        #BLOCKS=`du -s ${HDDDIR} | cut -f 1`
-        BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
-        SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`    
-
-        mkdosfs -n ${BOOTIMG_VOLUME_ID} -d ${HDDDIR} \
-        -C ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg $SIZE 
+        # Determine the 1024 byte block count for the final image.
+        BLOCKS=`du --apparent-size -ks ${HDDDIR} | cut -f 1`
+        SIZE=`expr $BLOCKS + ${BOOTIMG_EXTRA_SPACE}`
+
+        # Ensure total sectors is an integral number of sectors per
+        # track or mcopy will complain. Sectors are 512 bytes, and and
+        # we generate images with 32 sectors per track. This calculation
+        # is done in blocks, which are twice the size of sectors, thus
+        # the 16 instead of 32.
+        SIZE=$(expr $SIZE + $(expr 16 - $(expr $SIZE % 16)))
+
+        IMG=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
+        mkdosfs -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${IMG} ${SIZE}
+        # Copy HDDDIR recursively into the image file directly
+        mcopy -i ${IMG} -s ${HDDDIR}/* ::/
 
         syslinux ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg
         chmod 644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hddimg