From: Trevor Woerner <twoerner@gmail.com>
To: yocto-patches@lists.yoctoproject.org
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>,
Mark Hatle <mark.hatle@kernel.crashing.org>
Subject: [wic][PATCH 6/9] cli.py: remove bitbake coupling
Date: Fri, 3 Apr 2026 14:36:41 -0400 [thread overview]
Message-ID: <20260403183644.2783267-7-twoerner@gmail.com> (raw)
In-Reply-To: <20260403183644.2783267-1-twoerner@gmail.com>
The code that is being removed in this commit uses the scriptpath module
to add more paths to sys.path in order to find oe-core-specific and
bitbake-specific modules by using relative paths. In other words, this
code assumes it is located within oe-core or bitbake. By splitting out
wic, it is no longer located where these relative searches have any
chance of working, therefore remove this coupling.
Additionally, the bitbake_path variable does not appear to be used
anywhere, so it is removed as well.
NOTE: this commit does not work as-is, but is being provided in order to
explicitly show a clean transition from oe-core
Reviewed-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Reviewed-by: Mark Hatle <mark.hatle@kernel.crashing.org>
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
---
src/wic/cli.py | 7 -------
1 file changed, 7 deletions(-)
diff --git a/src/wic/cli.py b/src/wic/cli.py
index 9de5efbb5aec..04b2ad25cac5 100755
--- a/src/wic/cli.py
+++ b/src/wic/cli.py
@@ -28,10 +28,6 @@ from collections import namedtuple
# External modules
scripts_path = os.path.dirname(os.path.realpath(__file__))
-lib_path = scripts_path + '/lib'
-sys.path.insert(0, lib_path)
-import scriptpath
-scriptpath.add_oe_lib_path()
# Check whether wic is running within eSDK environment
sdkroot = scripts_path
@@ -48,9 +44,6 @@ if os.environ.get('SDKTARGETSYSROOT'):
sdkroot = os.path.dirname(sdkroot)
bitbake_exe = shutil.which('bitbake')
-if bitbake_exe:
- bitbake_path = scriptpath.add_bitbake_lib_path()
- import bb
from wic import WicError
from wic.misc import get_bitbake_var, BB_VARS
--
2.51.0
next prev parent reply other threads:[~2026-04-03 18:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-03 18:36 [wic][PATCH 0/9] standalone wic repository Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 1/9] re-organize for python src layout packaging Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 2/9] move example *wks files Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 3/9] create python hatch project Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 4/9] add oe-core and bitbake helper packages Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 5/9] bump version: 0.2.0 -> 0.3.0 Trevor Woerner
2026-04-03 18:36 ` Trevor Woerner [this message]
2026-04-03 18:36 ` [wic][PATCH 7/9] plugins/source/bootimg_biosplusefi.py: add import os Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 8/9] ksparser.py: search for *inc files Trevor Woerner
2026-04-03 18:36 ` [wic][PATCH 9/9] cli.py: fix main() for standalone mode Trevor Woerner
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=20260403183644.2783267-7-twoerner@gmail.com \
--to=twoerner@gmail.com \
--cc=bruce.ashfield@gmail.com \
--cc=mark.hatle@kernel.crashing.org \
--cc=yocto-patches@lists.yoctoproject.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.