diff mbox series

[isar-cip-core] classes/image_uuid: Correct task_order

Message ID 20230517115802.1416043-1-Quirin.Gylstorff@siemens.com (mailing list archive)
State Superseded
Headers show
Series [isar-cip-core] classes/image_uuid: Correct task_order | expand

Commit Message

Quirin Gylstorff May 17, 2023, 11:58 a.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

The file sw-description is generated from a template and requires
the TARGET_IMAGE_UUID. Therefore the image_uuid needs to be generated
before the template is evaluated.

Reported-by: Gokhan Cetin <gokhan.cetin@siemens.com>
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 classes/image_uuid.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Jan Kiszka May 17, 2023, 3:38 p.m. UTC | #1
On 17.05.23 13:58, Quirin Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> The file sw-description is generated from a template and requires
> the TARGET_IMAGE_UUID. Therefore the image_uuid needs to be generated
> before the template is evaluated.

But that image_uuid is used by the swupdate class shoulld not really be
known by image_uuid. It's a problem of the user, I would say. Can't we
tighten the dependencies over there instead?

Jan

> 
> Reported-by: Gokhan Cetin <gokhan.cetin@siemens.com>
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.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 9ffe14d..1578a88 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_rootfs_finalize after do_rootfs_postprocess
> +addtask generate_image_uuid before do_rootfs_finalize do_transform_template after do_rootfs_install
diff mbox series

Patch

diff --git a/classes/image_uuid.bbclass b/classes/image_uuid.bbclass
index 9ffe14d..1578a88 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_rootfs_finalize after do_rootfs_postprocess
+addtask generate_image_uuid before do_rootfs_finalize do_transform_template after do_rootfs_install