diff options
author | Gary Thomas <gary@mlbassoc.com> | 2015-06-15 08:41:33 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2015-06-15 12:12:23 -0300 |
commit | 928e817c442b0771f89317289046f51c07460b0f (patch) | |
tree | 18574c68d64c574d6a46d317ed24fa6695986772 /classes | |
parent | b4b950b67c8bd10fc8ae8864a39891a6d34b9730 (diff) | |
download | meta-fsl-arm-928e817c442b0771f89317289046f51c07460b0f.tar.gz |
image_types_fsl: Fix boot.img overwrite error
Recent updates to the MSDOS tools (OE-core is now at 3.0.28) have made
it an error to overwrite an image using mkfs.vfat:
mkfs.vfat: file XXXX/tmp/work/nitrogen6x-poky-linux-gnueabi/network-demo-image/1.0-r0/boot.img already exists
mkfs.fat 3.0.28 (2015-05-16)
WARNING: exit code 1 from a shell command.
This patch fixes the problem by removing any old/stale images before
trying to create the VFAT file system images.
Change-Id: I74e02fd512b43315b29698f534192632d7780df2
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/image_types_fsl.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass index 1ebcb06..b542549 100644 --- a/classes/image_types_fsl.bbclass +++ b/classes/image_types_fsl.bbclass | |||
@@ -152,6 +152,7 @@ generate_imx_sdcard () { | |||
152 | # Create boot partition image | 152 | # Create boot partition image |
153 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | 153 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ |
154 | | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') | 154 | | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 1024 }') |
155 | rm -f ${WORKDIR}/boot.img | ||
155 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS | 156 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS |
156 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} | 157 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} |
157 | 158 | ||
@@ -255,6 +256,7 @@ generate_mxs_sdcard () { | |||
255 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ | 256 | BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDCARD} unit b print \ |
256 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') | 257 | | awk '/ 2 / { print substr($4, 1, length($4 -1)) / 1024 }') |
257 | 258 | ||
259 | rm -f ${WORKDIR}/boot.img | ||
258 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS | 260 | mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS |
259 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} | 261 | mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin ::/${KERNEL_IMAGETYPE} |
260 | if test -n "${KERNEL_DEVICETREE}"; then | 262 | if test -n "${KERNEL_DEVICETREE}"; then |