[yocto] [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP

[Jonathan Liu]

Hi Trevor,

See if the following helps:
bitbake -c cleanall core-image-minimal && bitbake core-image-minimal

Regards,
Jonathan

On 5 October 2016 at 01:05, Trevor Woerner <twoerner at gmail.com> wrote:
> Unfortunately it doesn't fix the taskhash problem. It still happens on
> every build I perform:
>
> core-image-minimal-1.0-r0 do_image_rpi_sdimg: Taskhash mismatch
> 536a3bcf4ac29225841c369636b533ff versus
> 8fadff5d0ef51aa648ed359d5dd7f944
>
> In fact, every time I run a build I get the exact same two hashes.
>
> On Fri, Sep 16, 2016 at 1:28 PM, Andrei Gherzan <andrei at gherzan.ro> wrote:
>> On Tue, Sep 13, 2016 at 12:06:11PM +1000, Jonathan Liu 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 ::
>>>
>>
>> I like this. Merged to master.
>>
>> --
>> Andrei Gherzan
>>
>> --
>> _______________________________________________
>> yocto mailing list
>> yocto at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>>