diff options
author | Ross Burton <ross@openedhand.com> | 2008-09-26 08:58:28 +0000 |
---|---|---|
committer | Ross Burton <ross@openedhand.com> | 2008-09-26 08:58:28 +0000 |
commit | cd8b52418c475cf8708f136babb2bfa2f3b1744f (patch) | |
tree | 5733077975e7d4f0e7efbd89207d8f7d2268287a /bitbake/lib/bb | |
parent | 75f3f9bb6d823faec884569400f9dcb6c28ef732 (diff) | |
download | poky-cd8b52418c475cf8708f136babb2bfa2f3b1744f.tar.gz |
Merged revisions 5189-5198 via svnmerge from
https://svn.o-hand.com/repos/poky/trunk
........
r5189 | richard | 2008-09-11 23:41:08 +0100 (Thu, 11 Sep 2008) | 1 line
local.conf.sample: Make the parallel threads documentation more visible and update with a quadcore example
........
r5190 | richard | 2008-09-12 00:02:51 +0100 (Fri, 12 Sep 2008) | 1 line
handbook/quickstart: Improve documentation on the options available in local.conf
........
r5191 | richard | 2008-09-12 00:11:45 +0100 (Fri, 12 Sep 2008) | 1 line
handbook/faq.xml: Add a QA about proxy server setup
........
r5192 | ross | 2008-09-12 16:43:10 +0100 (Fri, 12 Sep 2008) | 1 line
ref-variables.xml: Add POKY_EXTRA_INSTALL
........
r5193 | ross | 2008-09-16 10:00:50 +0100 (Tue, 16 Sep 2008) | 1 line
poky-fixed-revisions.inc: bump matchbox-wm-2
........
r5194 | ross | 2008-09-16 16:36:32 +0100 (Tue, 16 Sep 2008) | 1 line
poky-fixed-revisions: bump libowl srvrev
........
r5195 | ross | 2008-09-16 17:24:31 +0100 (Tue, 16 Sep 2008) | 1 line
poky-fixed-revisions.inc: bump matchbox-desktop srvrev
........
r5196 | richard | 2008-09-16 20:14:49 +0100 (Tue, 16 Sep 2008) | 1 line
bitbake parse/__init_.py: Add missing update_mtime function fixing bitbake shell reparse failures
........
r5197 | richard | 2008-09-16 21:09:03 +0100 (Tue, 16 Sep 2008) | 1 line
ConfHandler.py: revert accidental commit
........
r5198 | ross | 2008-09-18 10:35:14 +0100 (Thu, 18 Sep 2008) | 1 line
poky-eabi.conf: add dialer to as-needed blacklist
........
git-svn-id: https://svn.o-hand.com/repos/poky/branches/elroy@5284 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb')
-rw-r--r-- | bitbake/lib/bb/parse/__init__.py | 4 | ||||
-rw-r--r-- | bitbake/lib/bb/parse/parse_py/BBHandler.py | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/lib/bb/parse/__init__.py b/bitbake/lib/bb/parse/__init__.py index 3c9ba8e6da..5dd96c4136 100644 --- a/bitbake/lib/bb/parse/__init__.py +++ b/bitbake/lib/bb/parse/__init__.py | |||
@@ -50,6 +50,10 @@ def cached_mtime_noerror(f): | |||
50 | return 0 | 50 | return 0 |
51 | return __mtime_cache[f] | 51 | return __mtime_cache[f] |
52 | 52 | ||
53 | def update_mtime(f): | ||
54 | __mtime_cache[f] = os.stat(f)[8] | ||
55 | return __mtime_cache[f] | ||
56 | |||
53 | def mark_dependency(d, f): | 57 | def mark_dependency(d, f): |
54 | if f.startswith('./'): | 58 | if f.startswith('./'): |
55 | f = "%s/%s" % (os.getcwd(), f[2:]) | 59 | f = "%s/%s" % (os.getcwd(), f[2:]) |
diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index d7bf6d4f37..cc8bc92e1d 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py | |||
@@ -122,8 +122,10 @@ def handle(fn, d, include = 0): | |||
122 | abs_fn = fn | 122 | abs_fn = fn |
123 | 123 | ||
124 | if ext != ".bbclass": | 124 | if ext != ".bbclass": |
125 | bbpath.insert(0, os.path.dirname(abs_fn)) | 125 | dname = os.path.dirname(abs_fn) |
126 | data.setVar('BBPATH', ":".join(bbpath), d) | 126 | if bbpath[0] != dname: |
127 | bbpath.insert(0, dname) | ||
128 | data.setVar('BBPATH', ":".join(bbpath), d) | ||
127 | 129 | ||
128 | if include: | 130 | if include: |
129 | bb.parse.mark_dependency(d, abs_fn) | 131 | bb.parse.mark_dependency(d, abs_fn) |