diff options
| author | Milton Miller <miltonm@us.ibm.com> | 2016-06-09 10:32:21 -0500 |
|---|---|---|
| committer | Milton Miller <miltonm@us.ibm.com> | 2016-06-30 14:46:39 -0500 |
| commit | 285b210effb9da5c953b824666df440db5e29f8f (patch) | |
| tree | 44240d3e680586de15cdd417fb63a1c4674be86c | |
| parent | f09d4b2ecf0ad6305d73a609b5c58027def1b0d7 (diff) | |
| download | talos-openbmc-285b210effb9da5c953b824666df440db5e29f8f.tar.gz talos-openbmc-285b210effb9da5c953b824666df440db5e29f8f.zip | |
image_types_uboot: Don't truncate when assembling flash
The generate_flash_image step was creating a file then using dd to
fill in the pieces, but missed adding the conv=notrunc flag, so each
step was shortening the file to its output.
Add the forgotten conversion flag to each dd command.
Signed-off-by: Milton Miller <miltonm@us.ibm.com>
| -rw-r--r-- | meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass index adb86e06d..67a389fbc 100644 --- a/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass +++ b/meta-phosphor/classes/obmc-phosphor-image_types_uboot.bbclass @@ -76,11 +76,11 @@ do_generate_flash() { dst="${ddir}/${FLASH_IMAGE_NAME}" rm -rf $dst mk_nor_image ${dst} ${FLASH_SIZE} - dd if=${ddir}/${uboot} of=${dst} bs=1k seek=${FLASH_UBOOT_OFFSET} - dd if=${ddir}/${kernel} of=${dst} bs=1k seek=${FLASH_KERNEL_OFFSET} - dd if=${ddir}/${uinitrd} of=${dst} bs=1k seek=${FLASH_INITRD_OFFSET} - dd if=${ddir}/${rootfs} of=${dst} bs=1k seek=${FLASH_ROFS_OFFSET} - dd if=${ddir}/${rwfs} of=${dst} bs=1k seek=${FLASH_RWFS_OFFSET} + dd if=${ddir}/${uboot} of=${dst} bs=1k conv=notrunc seek=${FLASH_UBOOT_OFFSET} + dd if=${ddir}/${kernel} of=${dst} bs=1k conv=notrunc seek=${FLASH_KERNEL_OFFSET} + dd if=${ddir}/${uinitrd} of=${dst} bs=1k conv=notrunc seek=${FLASH_INITRD_OFFSET} + dd if=${ddir}/${rootfs} of=${dst} bs=1k conv=notrunc seek=${FLASH_ROFS_OFFSET} + dd if=${ddir}/${rwfs} of=${dst} bs=1k conv=notrunc seek=${FLASH_RWFS_OFFSET} dstlink="${ddir}/${FLASH_IMAGE_LINK}" rm -rf $dstlink ln -sf ${FLASH_IMAGE_NAME} $dstlink |
