From 223d3b44c08c3522ef7c1d2f67f170e819b27c99 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 6 Jul 2017 11:43:00 +0300 Subject: 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] (From OE-Core rev: 18b52577484d3b86bc31980a50da04141afda5f9) Signed-off-by: Ed Bartosh Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/image-live.bbclass | 4 ++-- meta/classes/image-vm.bbclass | 2 +- 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 3a6e5f0e5b..c1862b1319 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 98bd92000e..b52df9fbf5 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 27b137dec6..e1d8b1843b 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. -- cgit v1.2.3-54-g00ecf