diff options
| -rw-r--r-- | lib/bb/cache.py | 1 | ||||
| -rw-r--r-- | lib/bb/cooker.py | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py index 21fa621c1..746236c89 100644 --- a/lib/bb/cache.py +++ b/lib/bb/cache.py @@ -569,7 +569,6 @@ class CacheData(object): self.ignored_dependencies = [] self.world_target = set() self.bbfile_priority = {} - self.bbfile_config_priorities = [] def add_from_recipeinfo(self, fn, info): self.task_deps[fn] = info.task_deps diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index bb2627293..c8d898ef2 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -547,6 +547,7 @@ class BBCooker: def handleCollections( self, collections ): """Handle collections""" + self.status.bbfile_config_priorities = [] if collections: collection_list = collections.split() for c in collection_list: @@ -617,6 +618,8 @@ class BBCooker: # Parse the configuration here. We need to do it explicitly here since # buildFile() doesn't use the cache self.parseConfiguration() + self.status = bb.cache.CacheData() + self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) ) # If we are told to do the None task then query the default task if (task == None): @@ -628,7 +631,6 @@ class BBCooker: self.buildSetVars() - self.status = bb.cache.CacheData() infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \ self.configuration.data) infos = dict(infos) |