diff options
-rw-r--r-- | bitbake/lib/bb/cache.py | 1 | ||||
-rw-r--r-- | bitbake/lib/bb/cooker.py | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index f3ba714d46..30857864dc 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -137,6 +137,7 @@ class Cache: | |||
137 | # If we're a virtual class we need to make sure all our depends are appended | 137 | # If we're a virtual class we need to make sure all our depends are appended |
138 | # to the depends of fn. | 138 | # to the depends of fn. |
139 | depends = self.getVar("__depends", virtualfn, True) or [] | 139 | depends = self.getVar("__depends", virtualfn, True) or [] |
140 | self.depends_cache.setdefault(fn, {}) | ||
140 | if "__depends" not in self.depends_cache[fn] or not self.depends_cache[fn]["__depends"]: | 141 | if "__depends" not in self.depends_cache[fn] or not self.depends_cache[fn]["__depends"]: |
141 | self.depends_cache[fn]["__depends"] = depends | 142 | self.depends_cache[fn]["__depends"] = depends |
142 | for dep in depends: | 143 | for dep in depends: |
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 2406dfe95b..f49e76d04a 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -630,13 +630,19 @@ class BBCooker: | |||
630 | if (task == None): | 630 | if (task == None): |
631 | task = self.configuration.cmd | 631 | task = self.configuration.cmd |
632 | 632 | ||
633 | fn = self.matchFile(buildfile) | 633 | self.bb_cache = bb.cache.init(self) |
634 | self.status = bb.cache.CacheData() | ||
635 | |||
636 | (fn, cls) = self.bb_cache.virtualfn2realfn(buildfile) | ||
637 | buildfile = self.matchFile(fn) | ||
638 | fn = self.bb_cache.realfn2virtual(buildfile, cls) | ||
639 | |||
634 | self.buildSetVars() | 640 | self.buildSetVars() |
635 | 641 | ||
636 | # Load data into the cache for fn and parse the loaded cache data | 642 | # Load data into the cache for fn and parse the loaded cache data |
637 | self.bb_cache = bb.cache.init(self) | 643 | the_data = self.bb_cache.loadDataFull(fn, self.configuration.data) |
638 | self.status = bb.cache.CacheData() | 644 | self.bb_cache.setData(fn, buildfile, the_data) |
639 | self.bb_cache.loadData(fn, self.configuration.data, self.status) | 645 | self.bb_cache.handle_data(fn, self.status) |
640 | 646 | ||
641 | # Tweak some variables | 647 | # Tweak some variables |
642 | item = self.bb_cache.getVar('PN', fn, True) | 648 | item = self.bb_cache.getVar('PN', fn, True) |