From 0b8a693fb4154a7efa811178ff166a9d3fb8a211 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 20 Mar 2012 16:06:24 +0000 Subject: buildhistory_analysis: use bb.utils.explode_dep_versions Previously this had its own implementation of splitting a list of packages with optional version e.g. "libncurses-dev (>= 5.9)"; switch to using the already existing bitbake function which does this as it is much better tested. (From OE-Core rev: de21a483063d9803c4ce1d62b03913ccad2931bd) Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- scripts/buildhistory-diff | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'scripts/buildhistory-diff') diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff index 6b344ebfaf..9936a4b605 100755 --- a/scripts/buildhistory-diff +++ b/scripts/buildhistory-diff @@ -6,7 +6,7 @@ # Author: Paul Eggleton import sys -import os.path +import os # Ensure PythonGit is installed (buildhistory_analysis needs it) try: @@ -24,8 +24,23 @@ def main(): sys.exit(1) # Set path to OE lib dir so we can import the buildhistory_analysis module - newpath = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])) + '/../meta/lib') - sys.path = sys.path + [newpath] + basepath = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])) + '/..') + newpath = basepath + '/meta/lib' + # Set path to bitbake lib dir so the buildhistory_analysis module can load bb.utils + if os.path.exists(basepath + '/bitbake/lib/bb'): + bitbakepath = basepath + '/bitbake' + else: + # look for bitbake/bin dir in PATH + bitbakepath = None + for pth in os.environ['PATH'].split(':'): + if os.path.exists(os.path.join(pth, '../lib/bb')): + bitbakepath = os.path.abspath(os.path.join(pth, '..')) + break + if not bitbakepath: + print("Unable to find bitbake by searching parent directory of this script or PATH") + sys.exit(1) + + sys.path.extend([newpath, bitbakepath + '/lib']) import oe.buildhistory_analysis if len(sys.argv) > 3: -- cgit v1.2.3-54-g00ecf