summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r--bitbake/lib/bb/data.py6
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py7
2 files changed, 11 insertions, 2 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py
index 9a32353d68..dc5a425d1c 100644
--- a/bitbake/lib/bb/data.py
+++ b/bitbake/lib/bb/data.py
@@ -357,6 +357,8 @@ def generate_dependencies(d):
357 357
358def inherits_class(klass, d): 358def inherits_class(klass, d):
359 val = getVar('__inherit_cache', d) or [] 359 val = getVar('__inherit_cache', d) or []
360 if os.path.join('classes', '%s.bbclass' % klass) in val: 360 needle = os.path.join('classes', '%s.bbclass' % klass)
361 return True 361 for v in val:
362 if v.endswith(needle):
363 return True
362 return False 364 return False
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py
index 92c55f531a..e6039e11a2 100644
--- a/bitbake/lib/bb/parse/parse_py/BBHandler.py
+++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py
@@ -74,6 +74,13 @@ def inherit(files, fn, lineno, d):
74 if not os.path.isabs(file) and not file.endswith(".bbclass"): 74 if not os.path.isabs(file) and not file.endswith(".bbclass"):
75 file = os.path.join('classes', '%s.bbclass' % file) 75 file = os.path.join('classes', '%s.bbclass' % file)
76 76
77 if not os.path.isabs(file):
78 dname = os.path.dirname(fn)
79 bbpath = "%s:%s" % (dname, d.getVar("BBPATH", True))
80 abs_fn = bb.utils.which(bbpath, file)
81 if abs_fn:
82 file = abs_fn
83
77 if not file in __inherit_cache: 84 if not file in __inherit_cache:
78 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file) 85 logger.log(logging.DEBUG -1, "BB %s:%d: inheriting %s", fn, lineno, file)
79 __inherit_cache.append( file ) 86 __inherit_cache.append( file )