diff mbox series

[isar-cip-core,v2] classes/swupdate: Correct task_order

Message ID 20230522121604.2175830-1-Quirin.Gylstorff@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core,v2] classes/swupdate: Correct task_order | expand

Commit Message

Quirin Gylstorff May 22, 2023, 12:16 p.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.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---

Changes v2:
 - move task order from image_uuid to swupdate.bbclass
 - adapt commit message

 classes/swupdate.bbclass | 3 +++
 1 file changed, 3 insertions(+)

Comments

Jan Kiszka May 27, 2023, 10:16 a.m. UTC | #1
On 22.05.23 14:16, 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.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
> 
> Changes v2:
>  - move task order from image_uuid to swupdate.bbclass
>  - adapt commit message
> 
>  classes/swupdate.bbclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass
> index 9a4d509..af9d12a 100644
> --- a/classes/swupdate.bbclass
> +++ b/classes/swupdate.bbclass
> @@ -46,6 +46,9 @@ IMAGE_TEMPLATE_VARS:swu = " \
>      SWU_VERSION \
>      SWU_NAME"
>  
> +# TARGET_IMAGE_UUID needs to be generated before completing the template
> +addtask do_transform_template after do_generate_image_uuid
> +
>  python(){
>      # create SWU_HW_COMPAT_NODE based on list of supported hw
>      hw_compat = d.getVar('SWU_HW_COMPAT')

Thanks, applied.

Jan
diff mbox series

Patch

diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass
index 9a4d509..af9d12a 100644
--- a/classes/swupdate.bbclass
+++ b/classes/swupdate.bbclass
@@ -46,6 +46,9 @@  IMAGE_TEMPLATE_VARS:swu = " \
     SWU_VERSION \
     SWU_NAME"
 
+# TARGET_IMAGE_UUID needs to be generated before completing the template
+addtask do_transform_template after do_generate_image_uuid
+
 python(){
     # create SWU_HW_COMPAT_NODE based on list of supported hw
     hw_compat = d.getVar('SWU_HW_COMPAT')