scripts/wic: use scriptpath module to find bitbake path and oe lib path

Use the scriptpath module in order to standardize the adding of
bitbake and meta/lib path to sys.path.

(From OE-Core rev: 8aba1fd023ce3c6767bf42b9faf9ec14fd7c4d02)

Signed-off-by: Chang Rebecca Swee Fun <rebecca.swee.fun.chang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Chang Rebecca Swee Fun 2018-01-11 22:55:19 +08:00 committed by Richard Purdie
parent 288728e030
commit be5616a27c

View File

@ -43,13 +43,12 @@ from distutils import spawn
scripts_path = os.path.abspath(os.path.dirname(__file__))
lib_path = scripts_path + '/lib'
sys.path.insert(0, lib_path)
oe_lib_path = os.path.join(os.path.dirname(scripts_path), 'meta', 'lib')
sys.path.insert(0, oe_lib_path)
import scriptpath
scriptpath.add_oe_lib_path()
bitbake_exe = spawn.find_executable('bitbake')
if bitbake_exe:
bitbake_path = os.path.join(os.path.dirname(bitbake_exe), '../lib')
sys.path.insert(0, bitbake_path)
bitbake_path = scriptpath.add_bitbake_lib_path()
from bb import cookerdata
from bb.main import bitbake_main, BitBakeConfigParameters
else: