diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-07-06 11:43:00 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-07-17 13:48:53 +0100 |
commit | 18b52577484d3b86bc31980a50da04141afda5f9 (patch) | |
tree | 5c7dfa13a549df0f767b4c9fad0602d260afc338 /meta | |
parent | aed3cebdfbd4f483644a8c200f27d52b981728a3 (diff) | |
download | openembedded-core-contrib-18b52577484d3b86bc31980a50da04141afda5f9.tar.gz |
live-vm-common: add MKDOSFS_EXTRAOPTS variable
Sometimes it's needed to create FAT filesystem with specific
sector or cluster size, FAT size or to use one of other useful
mkdosfs options.
Introduced MKDOSFS_EXTRAOPTS variable to set options for mkdosfs.
[YOCTO #11709]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image-live.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/image-vm.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/live-vm-common.bbclass | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 3a6e5f0e5b7..c1862b13195 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -217,10 +217,10 @@ build_fat_img() { fi if [ -z "${HDDIMG_ID}" ]; then - mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \ + mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \ ${BLOCKS} else - mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \ + mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \ ${BLOCKS} -i ${HDDIMG_ID} fi diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass index 98bd92000e3..b52df9fbf5a 100644 --- a/meta/classes/image-vm.bbclass +++ b/meta/classes/image-vm.bbclass @@ -68,7 +68,7 @@ build_boot_dd() { # Remove it since mkdosfs would fail when it exists rm -f $HDDIMG - mkdosfs -n ${BOOTDD_VOLUME_ID} -S 512 -C $HDDIMG $BLOCKS + mkdosfs -n ${BOOTDD_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C $HDDIMG $BLOCKS mcopy -i $HDDIMG -s $HDDDIR/* ::/ if [ "${PCBIOS}" = "1" ]; then diff --git a/meta/classes/live-vm-common.bbclass b/meta/classes/live-vm-common.bbclass index 27b137dec62..e1d8b1843b6 100644 --- a/meta/classes/live-vm-common.bbclass +++ b/meta/classes/live-vm-common.bbclass @@ -15,6 +15,8 @@ EFI = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "1", "0", d)}" EFI_PROVIDER ?= "grub-efi" EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" +MKDOSFS_EXTRAOPTS ??= "-S 512" + # Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not # contain "efi". This way legacy is supported by default if neither is # specified, maintaining the original behavior. |