summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Barker <pbarker@toganlabs.com>2017-09-08 13:22:34 +0000
committerAndrei Gherzan <andrei@gherzan.com>2017-09-24 20:39:35 +0100
commit134e7dd94334d3ac26bf0e51318f642154dd42da (patch)
treeaff3745a29d68ab1447ce01e3a95c35c5f1b4e0f
parente9bb7f0c6d3f77312970034ca0a63b3df0e3ba8e (diff)
downloadmeta-raspberrypi-134e7dd94334d3ac26bf0e51318f642154dd42da.tar.gz
sdcard_image-rpi: Drop unnecessary sync commands
These commands are unnecessary and seem to mask failures to find the rootfs.ext3 file when re-running the do_image_rpi_sdimg stage without re-running the preceeding do_image_ext3 stage. Signed-off-by: Paul Barker <pbarker@toganlabs.com>
-rw-r--r--classes/sdcard_image-rpi.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass
index 6b7433e..87c8afa 100644
--- a/classes/sdcard_image-rpi.bbclass
+++ b/classes/sdcard_image-rpi.bbclass
@@ -163,13 +163,13 @@ IMAGE_CMD_rpi-sdimg () {
163 fi 163 fi
164 164
165 # Burn Partitions 165 # Burn Partitions
166 dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync 166 dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
167 # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat 167 # If SDIMG_ROOTFS_TYPE is a .xz file use xzcat
168 if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz" 168 if echo "${SDIMG_ROOTFS_TYPE}" | egrep -q "*\.xz"
169 then 169 then
170 xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync 170 xzcat ${SDIMG_ROOTFS} | dd of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
171 else 171 else
172 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync 172 dd if=${SDIMG_ROOTFS} of=${SDIMG} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024)
173 fi 173 fi
174 174
175 # Optionally apply compression 175 # Optionally apply compression