diff mbox series

[isar-cip-core] image_uuid.bbclass: create /etc/osrelease file before do_rootfs_finalize

Message ID 20230508154031.26473-1-venkata.pyla@toshiba-tsip.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] image_uuid.bbclass: create /etc/osrelease file before do_rootfs_finalize | expand

Commit Message

Venkata Pyla May 8, 2023, 3:40 p.m. UTC 
From: venkata pyla <venkata.pyla@toshiba-tsip.com>

reproducible build with swupdate target is getting failed due to the
`/etc/osrelease` file timestamp is not constant across builds, it is due
to the file is generated after `do_rootfs_finalize` task and the
timestamps of the files are made constant in this task and so move the
task `do_generate_image_uuid` prior to `do_rootfs_finalize`.

Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
---
 classes/image_uuid.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jan Kiszka May 9, 2023, 6:21 a.m. UTC | #1 
On 08.05.23 17:40, venkata.pyla@toshiba-tsip.com wrote:
> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
> 
> reproducible build with swupdate target is getting failed due to the
> `/etc/osrelease` file timestamp is not constant across builds, it is due

os-release

> to the file is generated after `do_rootfs_finalize` task and the
> timestamps of the files are made constant in this task and so move the
> task `do_generate_image_uuid` prior to `do_rootfs_finalize`.
> 
> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
> ---
>  classes/image_uuid.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
> index 2bd530f..9ffe14d 100644
> --- a/classes/image_uuid.bbclass
> +++ b/classes/image_uuid.bbclass
> @@ -54,4 +54,4 @@ do_generate_image_uuid() {
>      echo "TARGET_IMAGE_UUID=\"${IMAGE_UUID}\"" \
>          > "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
>  }
> -addtask generate_image_uuid before do_image after do_rootfs
> +addtask generate_image_uuid before do_rootfs_finalize after do_rootfs_postprocess

Looks good to me - Quirin, any concerns?

Jan
Quirin Gylstorff May 9, 2023, 7:22 a.m. UTC | #2 
On 5/9/23 08:21, Jan Kiszka wrote:
> On 08.05.23 17:40, venkata.pyla@toshiba-tsip.com wrote:
>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>
>> reproducible build with swupdate target is getting failed due to the
>> `/etc/osrelease` file timestamp is not constant across builds, it is due
> 
> os-release
> 
>> to the file is generated after `do_rootfs_finalize` task and the
>> timestamps of the files are made constant in this task and so move the
>> task `do_generate_image_uuid` prior to `do_rootfs_finalize`.
>>
>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
>> ---
>>   classes/image_uuid.bbclass | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
>> index 2bd530f..9ffe14d 100644
>> --- a/classes/image_uuid.bbclass
>> +++ b/classes/image_uuid.bbclass
>> @@ -54,4 +54,4 @@ do_generate_image_uuid() {
>>       echo "TARGET_IMAGE_UUID=\"${IMAGE_UUID}\"" \
>>           > "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
>>   }
>> -addtask generate_image_uuid before do_image after do_rootfs
>> +addtask generate_image_uuid before do_rootfs_finalize after do_rootfs_postprocess
> 
> Looks good to me - Quirin, any concerns?

No concerns looks good to me.

Quirin
> 
> Jan
>
Jan Kiszka May 9, 2023, 8:41 a.m. UTC | #3 
On 09.05.23 09:22, Gylstorff Quirin wrote:
> 
> 
> On 5/9/23 08:21, Jan Kiszka wrote:
>> On 08.05.23 17:40, venkata.pyla@toshiba-tsip.com wrote:
>>> From: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>>
>>> reproducible build with swupdate target is getting failed due to the
>>> `/etc/osrelease` file timestamp is not constant across builds, it is due
>>
>> os-release
>>
>>> to the file is generated after `do_rootfs_finalize` task and the
>>> timestamps of the files are made constant in this task and so move the
>>> task `do_generate_image_uuid` prior to `do_rootfs_finalize`.
>>>
>>> Signed-off-by: venkata pyla <venkata.pyla@toshiba-tsip.com>
>>> ---
>>>   classes/image_uuid.bbclass | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
>>> index 2bd530f..9ffe14d 100644
>>> --- a/classes/image_uuid.bbclass
>>> +++ b/classes/image_uuid.bbclass
>>> @@ -54,4 +54,4 @@ do_generate_image_uuid() {
>>>       echo "TARGET_IMAGE_UUID=\"${IMAGE_UUID}\"" \
>>>           > "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
>>>   }
>>> -addtask generate_image_uuid before do_image after do_rootfs
>>> +addtask generate_image_uuid before do_rootfs_finalize after
>>> do_rootfs_postprocess
>>
>> Looks good to me - Quirin, any concerns?
> 
> No concerns looks good to me.
> 

Thanks, patch applied to next.

Jan
diff mbox series

Patch

diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
index 2bd530f..9ffe14d 100644
--- a/classes/image_uuid.bbclass
+++ b/classes/image_uuid.bbclass
@@ -54,4 +54,4 @@  do_generate_image_uuid() {
     echo "TARGET_IMAGE_UUID=\"${IMAGE_UUID}\"" \
         > "${DEPLOY_DIR_IMAGE}/${IMAGE_FULLNAME}.uuid.env"
 }
-addtask generate_image_uuid before do_image after do_rootfs
+addtask generate_image_uuid before do_rootfs_finalize after do_rootfs_postprocess