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

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

Am Fri, 4 Mar 2022 16:25:51 +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>
> ---
>  .../source/bootimg-biosplusefi-isar.py        | 24
> +++++++------------ 1 file changed, 8 insertions(+), 16 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..6bb15cd9 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-biosplusefi-isar.py @@
> -1,22 +1,14 @@ # -# This program is free software; you can
> redistribute it and/or modify -# it under the terms of the GNU
> General Public License version 2 as -# published by the Free Software
> Foundation. +# Imported from openembedded-core
>  #
> -# This program is distributed in the hope that it will be useful,
> -# but WITHOUT ANY WARRANTY; without even the implied warranty of
> -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> -# GNU General Public License for more details.
> -#
> -# You should have received a copy of the GNU General Public License
> along -# with this program; if not, write to the Free Software
> Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA. +# SPDX-License-Identifier: GPL-2.0-only
>  #
>  # DESCRIPTION
> -# This implements the 'bootimg-biosplusefi' source plugin class for
> 'wic' +# This implements the 'bootimg-biosplusefi-isar' source plugin
> class for 'wic' #

Please do not touch any of that, you are just asking for merge
conflicts if someone finds a typo or adds words ...

>  # AUTHORS
>  # William Bourque <wbourque [at) gmail.com>
> +# Felix Moessbauer <felix.moessbauer (at] siemens.com>

same here, unless you are super proud to add a few "isar" here and
there, not a noteworthy contrib

Henning

>  import types
>  
> @@ -75,10 +67,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 +98,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()
>  
>          # Import bootimg-efi (class name "BootimgEFIPlugin")
>          modulePath =
> os.path.join(os.path.dirname(os.path.realpath(__file__)),