diff options
Diffstat (limited to 'meta')
| -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() { | |||
| 202 | # Determine the final size in blocks accounting for some padding | 202 | # Determine the final size in blocks accounting for some padding |
| 203 | BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE}) | 203 | BLOCKS=$(expr $(expr $SECTORS / 2) + ${BOOTIMG_EXTRA_SPACE}) |
| 204 | 204 | ||
| 205 | # Ensure total sectors is an integral number of sectors per | ||
| 206 | # track or mcopy will complain. Sectors are 512 bytes, and we | ||
| 207 | # generate images with 32 sectors per track. This calculation is | ||
| 208 | # done in blocks, thus the mod by 16 instead of 32. | ||
| 209 | BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16))) | ||
| 210 | |||
| 211 | # mkdosfs will sometimes use FAT16 when it is not appropriate, | 205 | # mkdosfs will sometimes use FAT16 when it is not appropriate, |
| 212 | # resulting in a boot failure from SYSLINUX. Use FAT32 for | 206 | # resulting in a boot failure from SYSLINUX. Use FAT32 for |
| 213 | # images larger than 512MB, otherwise let mkdosfs decide. | 207 | # 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() { | |||
| 66 | BLOCKS=`du -bks $HDDDIR | cut -f 1` | 66 | BLOCKS=`du -bks $HDDDIR | cut -f 1` |
| 67 | BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` | 67 | BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` |
| 68 | 68 | ||
| 69 | # Ensure total sectors is an integral number of sectors per | ||
| 70 | # track or mcopy will complain. Sectors are 512 bytes, and we | ||
| 71 | # generate images with 32 sectors per track. This calculation is | ||
| 72 | # done in blocks, thus the mod by 16 instead of 32. | ||
| 73 | BLOCKS=$(expr $BLOCKS + $(expr 16 - $(expr $BLOCKS % 16))) | ||
| 74 | |||
| 75 | # Remove it since mkdosfs would fail when it exists | 69 | # Remove it since mkdosfs would fail when it exists |
| 76 | rm -f $HDDIMG | 70 | rm -f $HDDIMG |
| 77 | mkdosfs -n ${BOOTDD_VOLUME_ID} -S 512 -C $HDDIMG $BLOCKS | 71 | mkdosfs -n ${BOOTDD_VOLUME_ID} -S 512 -C $HDDIMG $BLOCKS |
