summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2017-07-06 11:43:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-07-17 14:01:37 +0100
commit223d3b44c08c3522ef7c1d2f67f170e819b27c99 (patch)
tree8b83d0a76e382e7fea65e33478806b6aedcd0a26 /meta
parente7a25d310569a0bd297f66745dcfec56923969bc (diff)
downloadpoky-223d3b44c08c3522ef7c1d2f67f170e819b27c99.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] (From OE-Core rev: 18b52577484d3b86bc31980a50da04141afda5f9) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image-live.bbclass4
-rw-r--r--meta/classes/image-vm.bbclass2
-rw-r--r--meta/classes/live-vm-common.bbclass2
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() {
217 fi 217 fi
218 218
219 if [ -z "${HDDIMG_ID}" ]; then 219 if [ -z "${HDDIMG_ID}" ]; then
220 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \ 220 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \
221 ${BLOCKS} 221 ${BLOCKS}
222 else 222 else
223 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \ 223 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C ${FATIMG} \
224 ${BLOCKS} -i ${HDDIMG_ID} 224 ${BLOCKS} -i ${HDDIMG_ID}
225 fi 225 fi
226 226
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() {
68 68
69 # Remove it since mkdosfs would fail when it exists 69 # Remove it since mkdosfs would fail when it exists
70 rm -f $HDDIMG 70 rm -f $HDDIMG
71 mkdosfs -n ${BOOTDD_VOLUME_ID} -S 512 -C $HDDIMG $BLOCKS 71 mkdosfs -n ${BOOTDD_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C $HDDIMG $BLOCKS
72 mcopy -i $HDDIMG -s $HDDDIR/* ::/ 72 mcopy -i $HDDIMG -s $HDDDIR/* ::/
73 73
74 if [ "${PCBIOS}" = "1" ]; then 74 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)}"
15EFI_PROVIDER ?= "grub-efi" 15EFI_PROVIDER ?= "grub-efi"
16EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}" 16EFI_CLASS = "${@bb.utils.contains("MACHINE_FEATURES", "efi", "${EFI_PROVIDER}", "", d)}"
17 17
18MKDOSFS_EXTRAOPTS ??= "-S 512"
19
18# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not 20# Include legacy boot if MACHINE_FEATURES includes "pcbios" or if it does not
19# contain "efi". This way legacy is supported by default if neither is 21# contain "efi". This way legacy is supported by default if neither is
20# specified, maintaining the original behavior. 22# specified, maintaining the original behavior.