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/parse_py/BBHandler.py | |
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/parse_py/BBHandler.py')
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 |
1 files changed, 0 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 | ||