diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-11 22:41:17 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-05-11 22:41:17 +0100 |
commit | 107a9da00640a9e086a8608c20aee48aefd92893 (patch) | |
tree | 97ace0c2103993bc780b221619391edb5e797432 /bitbake/lib/bb/parse | |
parent | 1ca980646deb13b2cf85b17e78de9faba0191dbf (diff) | |
download | poky-107a9da00640a9e086a8608c20aee48aefd92893.tar.gz |
bitbake: Merge further fixes from upstream 1.8 branch
* Make the test functionality work
* Optimise BBPATH handling when changing directory
* Optimise file globing for BBFILES
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'bitbake/lib/bb/parse')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/ConfHandler.py | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index 97786c4202..d13428aa0b 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -155,12 +155,6 @@ def handle(fn, d, include = 0): | |||
155 | f = open(fn,'r') | 155 | f = open(fn,'r') |
156 | abs_fn = fn | 156 | abs_fn = fn |
157 | 157 | ||
158 | if ext != ".bbclass": | ||
159 | dname = os.path.dirname(abs_fn) | ||
160 | if bbpath[0] != dname: | ||
161 | bbpath.insert(0, dname) | ||
162 | data.setVar('BBPATH', ":".join(bbpath), d) | ||
163 | |||
164 | if include: | 158 | if include: |
165 | bb.parse.mark_dependency(d, abs_fn) | 159 | bb.parse.mark_dependency(d, abs_fn) |
166 | 160 | ||
diff --git a/bitbake/lib/bb/parse/parse_py/ConfHandler.py b/bitbake/lib/bb/parse/parse_py/ConfHandler.py index f8a49689e2..c9f1ea13fb 100644 --- a/bitbake/lib/bb/parse/parse_py/ConfHandler.py +++ b/bitbake/lib/bb/parse/parse_py/ConfHandler.py | |||
@@ -102,6 +102,13 @@ def include(oldfn, fn, data, error_out): | |||
102 | fn = bb.data.expand(fn, data) | 102 | fn = bb.data.expand(fn, data) |
103 | oldfn = bb.data.expand(oldfn, data) | 103 | oldfn = bb.data.expand(oldfn, data) |
104 | 104 | ||
105 | if not os.path.isabs(fn): | ||
106 | dname = os.path.dirname(oldfn) | ||
107 | bbpath = "%s:%s" % (dname, bb.data.getVar("BBPATH", data, 1)) | ||
108 | abs_fn = bb.which(bbpath, fn) | ||
109 | if abs_fn: | ||
110 | fn = abs_fn | ||
111 | |||
105 | from bb.parse import handle | 112 | from bb.parse import handle |
106 | try: | 113 | try: |
107 | ret = handle(fn, data, True) | 114 | ret = handle(fn, data, True) |