[yocto] [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
Khem Raj
raj.khem at gmail.com
Tue Sep 13 13:27:28 PDT 2016
> On Sep 12, 2016, at 11:40 PM, Andreas Müller <schnitzeltony at googlemail.com> wrote:
>
> On Tue, Sep 13, 2016 at 4:06 AM, Jonathan Liu <net147 at gmail.com> wrote:
>> 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 at gmail.com>
>> ---
>> classes/sdcard_image-rpi.bbclass | 8 ++------
>> 1 file 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"
>> # Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
>> FATPAYLOAD ?= ""
>>
>> -IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
>> -IMAGE_CMD_rpi-sdimg[vardepsexclude] += "IMAGEDATESTAMP"
>> -IMAGE_CMD_rpi-sdimg[vardepsexclude] += "DATETIME"
>> -
>> IMAGE_CMD_rpi-sdimg () {
>>
>> # Align partitions
>> @@ -143,8 +139,8 @@ IMAGE_CMD_rpi-sdimg () {
>> fi
>>
>> # Add stamp file
>> - echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
>> - mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
>> + echo "${IMAGE_NAME}" > ${WORKDIR}/image-version-info
>> + mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}/image-version-info ::
>>
>> # Burn Partitions
>> dd if=${WORKDIR}/boot.img of=${SDIMG} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
>> --
>> 2.9.3
>>
> Yes this is better solution than Khem's and mine
seems so, I have staged it into kraj/master
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 204 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20160913/4da2bc9e/attachment.pgp>
More information about the yocto
mailing list