summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Madison <matt@madison.systems>2015-12-06 08:53:22 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-24 13:21:54 +0100
commit32728d09462d66cb0e9d5e366154b63058cb8709 (patch)
treefd0b53d2fe690b4d591d7f938f45807c28222614
parentdade0e68c645473d94e1b05020b064df40677e81 (diff)
downloadpoky-32728d09462d66cb0e9d5e366154b63058cb8709.tar.gz
wic: insert local Python paths at front
This follows how bitbake performs path insertion, and fixes a failure to start wic on Ubuntu 15.10 with the distribution's version of python-ply installed. (From OE-Core rev: b3a3935c69b6e74e19cd0cb69d47350b9ea9c58e) Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/wic4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wic b/scripts/wic
index 7ad2b191c6..2286f20a96 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -41,12 +41,12 @@ from distutils import spawn
41# External modules 41# External modules
42scripts_path = os.path.abspath(os.path.dirname(__file__)) 42scripts_path = os.path.abspath(os.path.dirname(__file__))
43lib_path = scripts_path + '/lib' 43lib_path = scripts_path + '/lib'
44sys.path.append(lib_path) 44sys.path.insert(0, lib_path)
45 45
46bitbake_exe = spawn.find_executable('bitbake') 46bitbake_exe = spawn.find_executable('bitbake')
47if bitbake_exe: 47if bitbake_exe:
48 bitbake_path = os.path.join(os.path.dirname(bitbake_exe), '../lib') 48 bitbake_path = os.path.join(os.path.dirname(bitbake_exe), '../lib')
49 sys.path.append(bitbake_path) 49 sys.path.insert(0, bitbake_path)
50 from bb import cookerdata 50 from bb import cookerdata
51 from bb.main import bitbake_main, BitBakeConfigParameters 51 from bb.main import bitbake_main, BitBakeConfigParameters
52else: 52else: