aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-10 17:25:04 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-10 18:04:07 +0100
commit1430a36e81737bd92245042710eb9d6ad8b6f1a7 (patch)
treed4f21b42ae0e98cafd66cb8e1c699f241ad9cb25
parentc3c2ad6f22e35b893a353d4c21d0e923e46ad07b (diff)
downloadbitbake-1430a36e81737bd92245042710eb9d6ad8b6f1a7.tar.gz
bitbake/cooker: Fix -b option by ensuring the empty cache structure is present
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--lib/bb/cache.py1
-rw-r--r--lib/bb/cooker.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index d4a16ad76..6c92a9363 100644
--- a/lib/bb/cache.py
+++ b/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/lib/bb/cooker.py b/lib/bb/cooker.py
index c23e3d4f1..da221664a 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -695,6 +695,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:
@@ -765,6 +766,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):