From 8aba1fd023ce3c6767bf42b9faf9ec14fd7c4d02 Mon Sep 17 00:00:00 2001 From: Chang Rebecca Swee Fun Date: Thu, 11 Jan 2018 22:55:19 +0800 Subject: 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. Signed-off-by: Chang Rebecca Swee Fun Signed-off-by: Richard Purdie --- scripts/wic | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'scripts/wic') diff --git a/scripts/wic b/scripts/wic index 097084a603..0d98875715 100755 --- a/scripts/wic +++ b/scripts/wic @@ -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: -- cgit 1.2.3-korg