@@ -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
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(-)