diff options
author | Jonathan Liu <net147@gmail.com> | 2016-09-13 12:06:11 +1000 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2016-09-16 18:30:08 +0100 |
commit | 4c02c7ce07121c2f5367204445f93199d828bb10 (patch) | |
tree | 190bc58889793b9fea2cb4b95d7a8241ca92c230 /classes | |
parent | cc64d6324d1543f009f0c010d720e74b7cb9f5d5 (diff) | |
download | meta-raspberrypi-4c02c7ce07121c2f5367204445f93199d828bb10.tar.gz |
sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
The IMAGE_NAME variable already contains the date and time so it is
redundant to also include the date again with IMAGEDATESTAMP
when writing to image-version-info in the boot partition.
Signed-off-by: Jonathan Liu <net147@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/sdcard_image-rpi.bbclass | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index 57cefea..388398b 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass | |||
@@ -71,10 +71,6 @@ SDIMG = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg" | |||
71 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. | 71 | # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS. |
72 | FATPAYLOAD ?= "" | 72 | FATPAYLOAD ?= "" |
73 | 73 | ||
74 | IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}" | ||
75 | IMAGE_CMD_rpi-sdimg[vardepsexclude] += "IMAGEDATESTAMP" | ||
76 | IMAGE_CMD_rpi-sdimg[vardepsexclude] += "DATETIME" | ||
77 | |||
78 | IMAGE_CMD_rpi-sdimg () { | 74 | IMAGE_CMD_rpi-sdimg () { |
79 | 75 | ||
80 | # Align partitions | 76 | # Align partitions |
@@ -143,8 +139,8 @@ IMAGE_CMD_rpi-sdimg () { | |||
143 | fi | 139 | fi |
144 | 140 | ||
145 | # Add stamp file | 141 | # Add stamp file |
146 | echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info | 142 | echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info |
147 | mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info :: | 143 | mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info :: |
148 | 144 | ||
149 | # Burn Partitions | 145 | # Burn Partitions |
150 | dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync | 146 | dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync |