From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: <isar-users@googlegroups.com>
Cc: <henning.schild@siemens.com>, <adriaan.schmidt@siemens.com>,
<jan.kiszka@siemens.com>,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 3/4] wic: biosplusefi: make sure sub-plugins can import isarpluginbase
Date: Fri, 4 Mar 2022 16:25:52 +0100 [thread overview]
Message-ID: <20220304152553.584534-4-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20220304152553.584534-1-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.
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')
--
2.30.2
next prev parent reply other threads:[~2022-03-04 15:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 15:25 [PATCH 0/4] Add support for dual bios + efi disk generation Felix Moessbauer
2022-03-04 15:25 ` [PATCH 1/4] Copy efi-plus-pcbios script from OE Felix Moessbauer
2022-03-04 15:25 ` [PATCH 2/4] Add ISAR version of biosplusefi WIC plugin Felix Moessbauer
2022-03-04 16:33 ` Henning Schild
2022-03-04 15:25 ` Felix Moessbauer [this message]
2022-03-04 16:34 ` [PATCH 3/4] wic: biosplusefi: make sure sub-plugins can import isarpluginbase Henning Schild
2022-03-04 15:25 ` [PATCH 4/4] test: add target for efi-plus-pcbios image type Felix Moessbauer
2022-03-04 16:41 ` Henning Schild
2022-03-04 21:28 ` Henning Schild
2022-03-04 21:26 ` [PATCH 0/4] Add support for dual bios + efi disk generation Henning Schild
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220304152553.584534-4-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=adriaan.schmidt@siemens.com \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--cc=jan.kiszka@siemens.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox