Re: [PATCH v3 2/7] Add ISAR version of biosplusefi WIC plugin

[Henning Schild <henning.schild@siemens.com>]

Am Tue, 22 Mar 2022 17:45:20 +0100
schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:

> This patch adds support to create a disk image that works with both
> EFI and legacy bios. The biosplusefi-isar is based on the original
> biosplusefi WIC plugin that internally calls the bootimg-pcbios and
> bootimg-efi. By that, code duplication can be avoided.
> 
> The generated image can be booted with EFI or legacy pcbios.
> 
> Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  .../lib/wic/plugins/source/bootimg-biosplusefi-isar.py    | 8
> ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git
> a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py
> b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py
> index 5bd73906..fb6b7fcc 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py @@
> -75,10 +75,10 @@ class BootimgBiosPlusEFIPlugin(SourcePlugin):
> --ondisk sda --label os_boot --active --align 1024 --use-uuid """ 
> -    name = 'bootimg-biosplusefi'
> +    name = 'bootimg-biosplusefi-isar'
>  
> -    __PCBIOS_MODULE_NAME = "bootimg-pcbios"
> -    __EFI_MODULE_NAME = "bootimg-efi"
> +    __PCBIOS_MODULE_NAME = "bootimg-pcbios-isar"
> +    __EFI_MODULE_NAME = "bootimg-efi-isar"
>  
>      __imgEFIObj = None
>      __imgBiosObj = None
> @@ -106,7 +106,7 @@ class BootimgBiosPlusEFIPlugin(SourcePlugin):
>          loader = SourceFileLoader(cls.__PCBIOS_MODULE_NAME,
> modulePath) mod = types.ModuleType(loader.name)
>          loader.exec_module(mod)
> -        cls.__imgBiosObj = mod.BootimgPcbiosPlugin()
> +        cls.__imgBiosObj = mod.BootimgPcbiosIsarPlugin()

Mhh, for some reason we did rename the class in that fork but not in
the EFI one.

Maybe something to get sorted out in this series, or later. Not sure
which option would be best ... i guess the consistent rename would be
the conservative option, meaning the EFI class would have to go 

-class BootimgEFIPlugin(SourcePlugin)
+class BootimgEFIIsarPlugin(SourcePlugin)

Henning

>          # Import bootimg-efi (class name "BootimgEFIPlugin")
>          modulePath =
> os.path.join(os.path.dirname(os.path.realpath(__file__)),