bitbake/cooker: Fix -b option by ensuring the empty cache structure is present

(Bitbake rev: 1430a36e81737bd92245042710eb9d6ad8b6f1a7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index d4a16ad7691ca7eaf4b4c949fe379d1706678850..6c92a9363a14d5482edd497c908e752f34a80a2a 100644 (file)
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -701,7 +701,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_array):
         for info in info_array:

diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index a64ee52c2caca812094c06a03382ccb5cff2430a..c81baf66b74c9cd20f6cebdb20b9b69849b33366 100644 (file)
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -699,6 +699,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:
@@ -769,6 +770,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.caches_array)
+        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):