wic: bootimg-efi-isar: use static method for _copy_additional_files

Message ID 20240325084904.2036784-1-srinuvasan.a@siemens.com
State Awaiting Upstream, archived
Headers show
Series wic: bootimg-efi-isar: use static method for _copy_additional_files | expand

Commit Message

Arjunan, Srinu March 25, 2024, 8:49 a.m. UTC
From: Srinuvasan A <srinuvasan.a@siemens.com>

Presently we uses classmethod decorator for _copy_additional_files
method, and actually this not needed becuase we are not accessing any
class variable or method in this function.

Change to static method for the below reason
- We are performing the generic functionality
- Moreover this should be initialized only once

Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
---
 meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Jan Kiszka March 25, 2024, 1:30 p.m. UTC | #1
On 25.03.24 09:49, srinuvasan.a via isar-users wrote:
> From: Srinuvasan A <srinuvasan.a@siemens.com>
> 
> Presently we uses classmethod decorator for _copy_additional_files
> method, and actually this not needed becuase we are not accessing any
> class variable or method in this function.
> 
> Change to static method for the below reason
> - We are performing the generic functionality
> - Moreover this should be initialized only once
> 
> Signed-off-by: Srinuvasan A <srinuvasan.a@siemens.com>
> ---
>  meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> index 4bfb70a0..5fe9bcb0 100644
> --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> @@ -40,8 +40,8 @@ class BootimgEFIPlugin(SourcePlugin):
>  
>      name = 'bootimg-efi-isar'
>  
> -    @classmethod
> -    def _copy_additional_files(cls, hdddir, initrd, dtb):
> +    @staticmethod
> +    def _copy_additional_files(hdddir, initrd, dtb):
>          bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
>          if not bootimg_dir:
>              raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")

This is not Isar-specific. Please address this in OE first.

Jan
Srinuvasan Arjunan March 25, 2024, 1:54 p.m. UTC | #2
On Monday, March 25, 2024 at 7:00:51 PM UTC+5:30 Jan Kiszka wrote:

On 25.03.24 09:49, srinuvasan.a via isar-users wrote: 
> From: Srinuvasan A <srinuv...@siemens.com> 
> 
> Presently we uses classmethod decorator for _copy_additional_files 
> method, and actually this not needed becuase we are not accessing any 
> class variable or method in this function. 
> 
> Change to static method for the below reason 
> - We are performing the generic functionality 
> - Moreover this should be initialized only once 
> 
> Signed-off-by: Srinuvasan A <srinuv...@siemens.com> 
> --- 
> meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 4 ++-- 
> 1 file changed, 2 insertions(+), 2 deletions(-) 
> 
> diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py 
b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py 
> index 4bfb70a0..5fe9bcb0 100644 
> --- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py 
> +++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py 
> @@ -40,8 +40,8 @@ class BootimgEFIPlugin(SourcePlugin): 
> 
> name = 'bootimg-efi-isar' 
> 
> - @classmethod 
> - def _copy_additional_files(cls, hdddir, initrd, dtb): 
> + @staticmethod 
> + def _copy_additional_files(hdddir, initrd, dtb): 
> bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") 
> if not bootimg_dir: 
> raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting") 

This is not Isar-specific. Please address this in OE first.


   Sure, thanks. 



Jan

Patch

diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index 4bfb70a0..5fe9bcb0 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -40,8 +40,8 @@  class BootimgEFIPlugin(SourcePlugin):
 
     name = 'bootimg-efi-isar'
 
-    @classmethod
-    def _copy_additional_files(cls, hdddir, initrd, dtb):
+    @staticmethod
+    def _copy_additional_files(hdddir, initrd, dtb):
         bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
         if not bootimg_dir:
             raise WicError("Couldn't find DEPLOY_DIR_IMAGE, exiting")