summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRicardo Neri <ricardo.neri-calderon@linux.intel.com>2014-07-01 17:57:38 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-10 17:38:33 +0100
commit28270fc8bfe7c4ddd0c5ef2b42a6620366ed8b32 (patch)
treed0c6f6185ec6defd5fa14e9f4e9d31e87e16a47a /meta/classes
parent2f7c92c4b5ec780cde4bce866a5095f5472ad88e (diff)
downloadpoky-28270fc8bfe7c4ddd0c5ef2b42a6620366ed8b32.tar.gz
bootimg.bbclass: Add parameter to specify HDDIMG volume ID
Users and children of the bootimg class may need to specify at build time the volume ID of the HDDIMG vfat partition. An example of this may be when at runtime the partition is uniquely identified by the volume ID. The HDDIMG_ID is expected to be provided externally. If the variable is not set, mkdosfs will use the default volume-id. (From OE-Core rev: 869a5c07f0ecc21b8cfbd239e901a9a4501ef087) Signed-off-by: Ricardo Neri <ricardo.neri-calderon@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/bootimg.bbclass10
1 files changed, 9 insertions, 1 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 7678567600..d52aacea81 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -22,6 +22,7 @@
22# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1 22# ${COMPRESSISO} - Transparent compress ISO, reduce size ~40% if set to 1
23# ${NOISO} - skip building the ISO image if set to 1 23# ${NOISO} - skip building the ISO image if set to 1
24# ${NOHDD} - skip building the HDD image if set to 1 24# ${NOHDD} - skip building the HDD image if set to 1
25# ${HDDIMG_ID} - FAT image volume-id
25# ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional) 26# ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional)
26 27
27do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ 28do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
@@ -193,7 +194,14 @@ build_fat_img() {
193 FATSIZE="-F 32" 194 FATSIZE="-F 32"
194 fi 195 fi
195 196
196 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} ${BLOCKS} 197 if [ -z "${HDDIMG_ID}" ]; then
198 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \
199 ${BLOCKS}
200 else
201 mkdosfs ${FATSIZE} -n ${BOOTIMG_VOLUME_ID} -S 512 -C ${FATIMG} \
202 ${BLOCKS} -i ${HDDIMG_ID}
203 fi
204
197 # Copy FATSOURCEDIR recursively into the image file directly 205 # Copy FATSOURCEDIR recursively into the image file directly
198 mcopy -i ${FATIMG} -s ${FATSOURCEDIR}/* ::/ 206 mcopy -i ${FATIMG} -s ${FATSOURCEDIR}/* ::/
199} 207}