Re: [PATCH 3/4] wic: biosplusefi: make sure sub-plugins can import isarpluginbase

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

Am Fri, 4 Mar 2022 16:25:52 +0100
schrieb Felix Moessbauer <felix.moessbauer@siemens.com>:

> From: Henning Schild <henning.schild@siemens.com>
> 
> The plugin calls other plugins, which in our case use isarpluginbase.
> Make sure that will be in the path so that it can be imported.

I gave you a wrong commit message, please update according to what i
gave you off list.

My bad.

Henning

> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> Acked-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> ---
>  meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py    | 6 ++++--
>  meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py | 6 ++++--
>  2 files changed, 8 insertions(+), 4 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
> d9712548..5ba0777a 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py @@ -23,8
> +23,10 @@ from wic.pluginbase import SourcePlugin from wic.misc
> import (exec_cmd, exec_native_cmd, get_bitbake_var,
> BOOTDD_EXTRA_SPACE) 
> -import sys
> -sys.path[0] = os.path.dirname(os.path.abspath(__file__)) + "/.."
> +# allow plugins to import from isarpluginbase
> +if '__file__' in globals():
> +    import sys
> +    sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
> "/..") from isarpluginbase import (isar_get_filenames,
> isar_populate_boot_cmd) 
>  logger = logging.getLogger('wic')
> diff --git
> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py
> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py index
> f493890f..9136d4f2 100644 ---
> a/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py +++
> b/meta/scripts/lib/wic/plugins/source/bootimg-pcbios-isar.py @@ -20,8
> +20,10 @@ from wic.pluginbase import SourcePlugin from wic.misc
> import (exec_cmd, exec_native_cmd, get_bitbake_var,
> BOOTDD_EXTRA_SPACE) -import sys
> -sys.path[0] = os.path.dirname(os.path.abspath(__file__)) + "/.."
> +# allow plugins to import from isarpluginbase
> +if '__file__' in globals():
> +    import sys
> +    sys.path.append(os.path.dirname(os.path.abspath(__file__)) +
> "/..") from isarpluginbase import (isar_get_filenames,
> isar_populate_boot_cmd) 
>  logger = logging.getLogger('wic')