summaryrefslogtreecommitdiffstats
path: root/bitbake
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-13 15:10:07 +0100
commitba5db2d81c11089a321629cf2161c78adfe95675 (patch)
treee0aba5bf56dbc14d3914e05fc336ef3ea97cfbfb /bitbake
parentb30cb584a738915113e88b7db1028d53b2bae5f9 (diff)
downloadast2050-yocto-poky-ba5db2d81c11089a321629cf2161c78adfe95675.zip
ast2050-yocto-poky-ba5db2d81c11089a321629cf2161c78adfe95675.tar.gz
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>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cache.py1
-rw-r--r--bitbake/lib/bb/cooker.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index d4a16ad..6c92a93 100644
--- 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 a64ee52..c81baf6 100644
--- 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):
OpenPOWER on IntegriCloud