[gnome-continuous-yocto/gnomeostree-3.28-rocko: 703/8267] image-live, image-vm, wic: Remove fs size workaround

[Emmanuele Bassi <ebassi src gnome org>]

commit 469e56b1a7c8da38cb4c572c5609c86b8c9768dd
Author: Jussi Kukkonen <jussi kukkonen intel com>
Date:   Thu Jun 2 13:49:33 2016 +0300

    image-live, image-vm, wic: Remove fs size workaround
    
    Since mtools has been patched to live with filesystems with sizes
    not divisible by sectors-per-track, we no longer need to try to
    set the size based on our guess of the sectors-per-track dosfstools is
    going to use.
    
    (From OE-Core rev: 334e32af88b310ff1ed950d127a6dedeb460f8d0)
    
    Signed-off-by: Jussi Kukkonen <jussi kukkonen intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image-live.bbclass                    |    6 ------
 meta/classes/image-vm.bbclass                      |    6 ------
 scripts/lib/wic/partition.py                       |    8 --------
 scripts/lib/wic/plugins/source/bootimg-efi.py      |    6 ------
 scripts/lib/wic/plugins/source/bootimg-pcbios.py   |    6 ------
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |    6 ------
 6 files changed, 0 insertions(+), 38 deletions(-)
---
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index ea6ced2..f0e6647 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -202,12 +202,6 @@ build_fat_img() {
        # Determine the final size in blocks accounting for some padding
        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
-       # generate images with 32 sectors per track. This calculation is
-       # done in blocks, thus the mod by 16 instead of 32.
-       BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16)))
-
        # mkdosfs will sometimes use FAT16 when it is not appropriate,
        # resulting in a boot failure from SYSLINUX. Use FAT32 for
        # images larger than 512MB, otherwise let mkdosfs decide.
diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass
index 2bbd9d3..72f7b4b 100644
--- a/meta/classes/image-vm.bbclass
+++ b/meta/classes/image-vm.bbclass
@@ -66,12 +66,6 @@ build_boot_dd() {
        BLOCKS=`du -bks $HDDDIR | cut -f 1`
        BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
 
-       # Ensure total sectors is an integral number of sectors per
-       # track or mcopy will complain. Sectors are 512 bytes, and we
-       # generate images with 32 sectors per track. This calculation is
-       # done in blocks, thus the mod by 16 instead of 32.
-       BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16)))
-
        # Remove it since mkdosfs would fail when it exists
        rm -f $HDDIMG
        mkdosfs -n ${BOOTDD_VOLUME_ID} -S 512 -C $HDDIMG $BLOCKS 
diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py
index 34fd7d6..30cd320 100644
--- a/scripts/lib/wic/partition.py
+++ b/scripts/lib/wic/partition.py
@@ -281,14 +281,6 @@ class Partition():
         msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
                     (extra_blocks, self.mountpoint, blocks))
 
-        # Ensure total sectors is an integral number of sectors per
-        # track or mcopy will complain. Sectors are 512 bytes, and we
-        # generate images with 32 sectors per track. This calculation
-        # is done in blocks, thus the mod by 16 instead of 32. Apply
-        # sector count fix only when needed.
-        if blocks % 16 != 0:
-            blocks += (16 - (blocks % 16))
-
         label_str = "-n boot"
         if self.label:
             label_str = "-n %s" % self.label
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index ec13f6d..3a16861 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -216,12 +216,6 @@ class BootimgEFIPlugin(SourcePlugin):
         msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
                     (extra_blocks, part.mountpoint, blocks))
 
-        # Ensure total sectors is an integral number of sectors per
-        # track or mcopy will complain. Sectors are 512 bytes, and we
-        # generate images with 32 sectors per track. This calculation is
-        # done in blocks, thus the mod by 16 instead of 32.
-        blocks += (16 - (blocks % 16))
-
         # dosfs image, created by mkdosfs
         bootimg = "%s/boot.img" % cr_workdir
 
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py 
b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
index 5b719bf..f204daa 100644
--- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
+++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py
@@ -179,12 +179,6 @@ class BootimgPcbiosPlugin(SourcePlugin):
         msger.debug("Added %d extra blocks to %s to get to %d total blocks" % \
                     (extra_blocks, part.mountpoint, blocks))
 
-        # Ensure total sectors is an integral number of sectors per
-        # track or mcopy will complain. Sectors are 512 bytes, and we
-        # generate images with 32 sectors per track. This calculation is
-        # done in blocks, thus the mod by 16 instead of 32.
-        blocks += (16 - (blocks % 16))
-
         # dosfs image, created by mkdosfs
         bootimg = "%s/boot.img" % cr_workdir
 
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py 
b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index ed59d85..3858fd4 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -441,12 +441,6 @@ class IsoImagePlugin(SourcePlugin):
                     % (part.mountpoint, blocks)
             msger.debug(msg)
 
-            # Ensure total sectors is an integral number of sectors per
-            # track or mcopy will complain. Sectors are 512 bytes, and we
-            # generate images with 32 sectors per track. This calculation is
-            # done in blocks, thus the mod by 16 instead of 32.
-            blocks += (16 - (blocks % 16))
-
             # dosfs image for EFI boot
             bootimg = "%s/efi.img" % isodir