diff mbox series

[isar-cip-core] classes, recipes-initramfs: remove do prefix for adding task

Message ID 20240423153532.175546-1-srinuvasan.a@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] classes, recipes-initramfs: remove do prefix for adding task | expand

Commit Message

Arjunan, Srinu April 23, 2024, 3:35 p.m. UTC 
From: Srinuvasan A <srinuvasan.a@siemens.com>

Try to follow the same pattern as bitbake recommended to add the task
using addtask directive, only we corrected the style apart from there is no functional changes.

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 classes/delta-update.bbclass                                  | 2 +-
 classes/deploy-firmware.bbclass                               | 4 ++--
 classes/swupdate.bbclass                                      | 2 +-
 classes/verity.bbclass                                        | 4 ++--
 .../initramfs-verity-hook/initramfs-verity-hook_0.1.bb        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

Comments

Jan Kiszka July 12, 2024, 9:35 a.m. UTC | #1 
On 23.04.24 17:35, srinuvasan.a@siemens.com wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Try to follow the same pattern as bitbake recommended to add the task
> using addtask directive, only we corrected the style apart from there is no functional changes.
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  classes/delta-update.bbclass                                  | 2 +-
>  classes/deploy-firmware.bbclass                               | 4 ++--
>  classes/swupdate.bbclass                                      | 2 +-
>  classes/verity.bbclass                                        | 4 ++--
>  .../initramfs-verity-hook/initramfs-verity-hook_0.1.bb        | 4 ++--
>  5 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/classes/delta-update.bbclass b/classes/delta-update.bbclass
> index c2df266..ae2453d 100644
> --- a/classes/delta-update.bbclass
> +++ b/classes/delta-update.bbclass
> @@ -96,4 +96,4 @@ IMAGE_CMD:delta_update() {
>      esac
>  }
>  
> -addtask do_image_delta_update before do_image_swu after do_image_wic
> +addtask image_delta_update before do_image_swu after do_image_wic
> diff --git a/classes/deploy-firmware.bbclass b/classes/deploy-firmware.bbclass
> index a4b754a..aad7277 100644
> --- a/classes/deploy-firmware.bbclass
> +++ b/classes/deploy-firmware.bbclass
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2023
> +# Copyright (c) Siemens AG, 2024
>  #
>  # Authors:
>  #  Felix Moessbauer <felix.moessbauer@siemens.com>
> @@ -27,6 +27,6 @@ do_deploy_firmware() {
>  python do_deploy_firmware_setscene () {
>      sstate_setscene(d)
>  }
> -addtask do_deploy_firmware_setscene
> +addtask deploy_firmware_setscene
>  
>  addtask deploy_firmware after do_dpkg_build before do_deploy_deb
> diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass
> index e91238d..0fd6329 100644
> --- a/classes/swupdate.bbclass
> +++ b/classes/swupdate.bbclass
> @@ -71,7 +71,7 @@ IMAGE_TEMPLATE_VARS:swu = " \
>      "
>  
>  # TARGET_IMAGE_UUID needs to be generated before completing the template
> -addtask do_transform_template after do_generate_image_uuid
> +addtask transform_template after do_generate_image_uuid
>  
>  python do_extend_sw_description() {
>      cmds = d.getVar("SWU_EXTEND_SW_DESCRIPTION")
> diff --git a/classes/verity.bbclass b/classes/verity.bbclass
> index 9030c84..93dcd31 100644
> --- a/classes/verity.bbclass
> +++ b/classes/verity.bbclass
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2021-2022
> +# Copyright (c) Siemens AG, 2024
>  #
>  # Authors:
>  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -104,4 +104,4 @@ IMAGE_CMD:verity() {
>          >>"${WORKDIR}/${VERITY_IMAGE_METADATA}"
>      create_verity_env_file
>  }
> -addtask do_image_verity after do_generate_image_uuid
> +addtask image_verity after do_generate_image_uuid
> diff --git a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
> index 3fc63ed..526a8d6 100644
> --- a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
> +++ b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2021
> +# Copyright (c) Siemens AG, 2024
>  #
>  # Authors:
>  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -53,4 +53,4 @@ do_install() {
>          "${D}/usr/share/initramfs-tools/hooks/verity"
>  }
>  
> -addtask do_install after do_transform_template
> +addtask install after do_transform_template

Thanks, applied - after searching for it for a while again due to the
wrong timestamp used. Patches can get lost because of that.

Jan
diff mbox series

Patch

diff --git a/classes/delta-update.bbclass b/classes/delta-update.bbclass
index c2df266..ae2453d 100644
--- a/classes/delta-update.bbclass
+++ b/classes/delta-update.bbclass
@@ -96,4 +96,4 @@  IMAGE_CMD:delta_update() {
     esac
 }
 
-addtask do_image_delta_update before do_image_swu after do_image_wic
+addtask image_delta_update before do_image_swu after do_image_wic
diff --git a/classes/deploy-firmware.bbclass b/classes/deploy-firmware.bbclass
index a4b754a..aad7277 100644
--- a/classes/deploy-firmware.bbclass
+++ b/classes/deploy-firmware.bbclass
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2023
+# Copyright (c) Siemens AG, 2024
 #
 # Authors:
 #  Felix Moessbauer <felix.moessbauer@siemens.com>
@@ -27,6 +27,6 @@  do_deploy_firmware() {
 python do_deploy_firmware_setscene () {
     sstate_setscene(d)
 }
-addtask do_deploy_firmware_setscene
+addtask deploy_firmware_setscene
 
 addtask deploy_firmware after do_dpkg_build before do_deploy_deb
diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass
index e91238d..0fd6329 100644
--- a/classes/swupdate.bbclass
+++ b/classes/swupdate.bbclass
@@ -71,7 +71,7 @@  IMAGE_TEMPLATE_VARS:swu = " \
     "
 
 # TARGET_IMAGE_UUID needs to be generated before completing the template
-addtask do_transform_template after do_generate_image_uuid
+addtask transform_template after do_generate_image_uuid
 
 python do_extend_sw_description() {
     cmds = d.getVar("SWU_EXTEND_SW_DESCRIPTION")
diff --git a/classes/verity.bbclass b/classes/verity.bbclass
index 9030c84..93dcd31 100644
--- a/classes/verity.bbclass
+++ b/classes/verity.bbclass
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021-2022
+# Copyright (c) Siemens AG, 2024
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -104,4 +104,4 @@  IMAGE_CMD:verity() {
         >>"${WORKDIR}/${VERITY_IMAGE_METADATA}"
     create_verity_env_file
 }
-addtask do_image_verity after do_generate_image_uuid
+addtask image_verity after do_generate_image_uuid
diff --git a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
index 3fc63ed..526a8d6 100644
--- a/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
+++ b/recipes-initramfs/initramfs-verity-hook/initramfs-verity-hook_0.1.bb
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2021
+# Copyright (c) Siemens AG, 2024
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -53,4 +53,4 @@  do_install() {
         "${D}/usr/share/initramfs-tools/hooks/verity"
 }
 
-addtask do_install after do_transform_template
+addtask install after do_transform_template