diff options
| author |   Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-06-02 13:49:33 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-03 13:13:30 +0100 |
| commit | 469e56b1a7c8da38cb4c572c5609c86b8c9768dd (patch) | |
| tree | a9d0679ea912541b89a24e4f308496d0a4405f07 /meta/classes | |
| parent | 48bc62378a3705730f376ca03c2d6efe7a98d924 (diff) | |
| download | openembedded-core-contrib-469e56b1a7c8da38cb4c572c5609c86b8c9768dd.tar.gz | |
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>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image-live.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/image-vm.bbclass | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index ea6ced2dcb..f0e6647ac1 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 2bbd9d3671..72f7b4b101 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 |