* [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
@ 2016-09-13 2:06 Jonathan Liu
2016-09-13 6:40 ` Andreas Müller
2016-09-16 17:28 ` Andrei Gherzan
0 siblings, 2 replies; 9+ messages in thread
From: Jonathan Liu @ 2016-09-13 2:06 UTC (permalink / raw)
To: yocto
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>
---
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
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-09-13 2:06 [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP Jonathan Liu
@ 2016-09-13 6:40 ` Andreas Müller
2016-09-13 20:27 ` Khem Raj
2016-09-16 17:28 ` Andrei Gherzan
1 sibling, 1 reply; 9+ messages in thread
From: Andreas Müller @ 2016-09-13 6:40 UTC (permalink / raw)
To: Jonathan Liu; +Cc: Yocto Project
On Tue, Sep 13, 2016 at 4:06 AM, Jonathan Liu <net147@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@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
Andreas
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-09-13 6:40 ` Andreas Müller
@ 2016-09-13 20:27 ` Khem Raj
0 siblings, 0 replies; 9+ messages in thread
From: Khem Raj @ 2016-09-13 20:27 UTC (permalink / raw)
To: Andreas Müller; +Cc: Yocto Project
[-- Attachment #1: Type: text/plain, Size: 1893 bytes --]
> On Sep 12, 2016, at 11:40 PM, Andreas Müller <schnitzeltony@googlemail.com> wrote:
>
> On Tue, Sep 13, 2016 at 4:06 AM, Jonathan Liu <net147@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@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
[-- Attachment #2: Message signed with OpenPGP using GPGMail --]
[-- Type: application/pgp-signature, Size: 211 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-09-13 2:06 [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP Jonathan Liu
2016-09-13 6:40 ` Andreas Müller
@ 2016-09-16 17:28 ` Andrei Gherzan
2016-10-04 14:05 ` Trevor Woerner
1 sibling, 1 reply; 9+ messages in thread
From: Andrei Gherzan @ 2016-09-16 17:28 UTC (permalink / raw)
To: Jonathan Liu; +Cc: yocto
[-- Attachment #1: Type: text/plain, Size: 1491 bytes --]
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@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 817 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-09-16 17:28 ` Andrei Gherzan
@ 2016-10-04 14:05 ` Trevor Woerner
2016-10-05 0:01 ` Jonathan Liu
0 siblings, 1 reply; 9+ messages in thread
From: Trevor Woerner @ 2016-10-04 14:05 UTC (permalink / raw)
To: Andrei Gherzan; +Cc: yocto@yoctoproject.org
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@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@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@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-10-04 14:05 ` Trevor Woerner
@ 2016-10-05 0:01 ` Jonathan Liu
2016-10-05 5:40 ` Andreas Müller
2016-10-05 15:00 ` Trevor Woerner
0 siblings, 2 replies; 9+ messages in thread
From: Jonathan Liu @ 2016-10-05 0:01 UTC (permalink / raw)
To: Trevor Woerner; +Cc: yocto@yoctoproject.org
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@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@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@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@yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/yocto
>>
^ permalink raw reply [flat|nested] 9+ messages in thread* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-10-05 0:01 ` Jonathan Liu
@ 2016-10-05 5:40 ` Andreas Müller
2016-10-05 15:00 ` Trevor Woerner
1 sibling, 0 replies; 9+ messages in thread
From: Andreas Müller @ 2016-10-05 5:40 UTC (permalink / raw)
To: Jonathan Liu; +Cc: yocto@yoctoproject.org
On Wed, Oct 5, 2016 at 2:01 AM, Jonathan Liu <net147@gmail.com> wrote:
> Hi Trevor,
>
> See if the following helps:
> bitbake -c cleanall core-image-minimal && bitbake core-image-minimal
>
> Regards,
> Jonathan
>
Hi,
I would try a cleansstate for virtual/kernel too. In my meta.. fork I did:
* kick out huge parts of linux-raspberrypi-base.bbclass
* finally removed stamp file creation in sdcard_image-rpi.bbclass
* build from scratch
and did not see this message again - up to now...
Andreas
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-10-05 0:01 ` Jonathan Liu
2016-10-05 5:40 ` Andreas Müller
@ 2016-10-05 15:00 ` Trevor Woerner
2016-10-06 10:28 ` Jonathan Liu
1 sibling, 1 reply; 9+ messages in thread
From: Trevor Woerner @ 2016-10-05 15:00 UTC (permalink / raw)
To: Jonathan Liu; +Cc: yocto@yoctoproject.org
On Wed 2016-10-05 @ 11:01:15 AM, Jonathan Liu wrote:
> See if the following helps:
> bitbake -c cleanall core-image-minimal && bitbake core-image-minimal
Odd. I had started this email to say that this wasn't working (since this is
exactly what I had tried a couple times over the last several days) and I find
I can't reproduce the issue.
I was able to reproduce the issue a couple times earlier today, but to write
this email I updates all repositories. There was no change (since yesterday)
to meta-raspberrypi but openembedded-core had updates, and some of those
updates required an update to bitbake. Now everything seems to work.
I'll keep an eye on it ;-)
Thanks and best regards,
Trevor
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP
2016-10-05 15:00 ` Trevor Woerner
@ 2016-10-06 10:28 ` Jonathan Liu
0 siblings, 0 replies; 9+ messages in thread
From: Jonathan Liu @ 2016-10-06 10:28 UTC (permalink / raw)
To: Trevor Woerner; +Cc: yocto@yoctoproject.org
On 6 October 2016 at 02:00, Trevor Woerner <twoerner@gmail.com> wrote:
> On Wed 2016-10-05 @ 11:01:15 AM, Jonathan Liu wrote:
>> See if the following helps:
>> bitbake -c cleanall core-image-minimal && bitbake core-image-minimal
>
> Odd. I had started this email to say that this wasn't working (since this is
> exactly what I had tried a couple times over the last several days) and I find
> I can't reproduce the issue.
>
> I was able to reproduce the issue a couple times earlier today, but to write
> this email I updates all repositories. There was no change (since yesterday)
> to meta-raspberrypi but openembedded-core had updates, and some of those
> updates required an update to bitbake. Now everything seems to work.
>
> I'll keep an eye on it ;-)
>
> Thanks and best regards,
> Trevor
I ran into this issue again after wiping my build directory.
I suspect it may be the kernel version checking logic causing the issue.
For a clean build directory:
$ bitbake -e core-image-minimal | grep ^RPI_KERNEL_VERSION
RPI_KERNEL_VERSION="None"
For a used build directory:
$ bitbake -e core-image-minimal | grep ^RPI_KERNEL_VERSION
RPI_KERNEL_VERSION="4.4.16"
Regards,
Jonathan
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2016-10-06 10:28 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-13 2:06 [meta-raspberrypi][PATCH] sdcard_image-rpi.bbclass: remove redundant IMAGEDATESTAMP Jonathan Liu
2016-09-13 6:40 ` Andreas Müller
2016-09-13 20:27 ` Khem Raj
2016-09-16 17:28 ` Andrei Gherzan
2016-10-04 14:05 ` Trevor Woerner
2016-10-05 0:01 ` Jonathan Liu
2016-10-05 5:40 ` Andreas Müller
2016-10-05 15:00 ` Trevor Woerner
2016-10-06 10:28 ` Jonathan Liu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.