summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-10 16:25:04 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-13 14:10:07 (GMT)
commitba5db2d81c11089a321629cf2161c78adfe95675 (patch)
treee0aba5bf56dbc14d3914e05fc336ef3ea97cfbfb /bitbake
parentb30cb584a738915113e88b7db1028d53b2bae5f9 (diff)
downloadpoky-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):
701 self.ignored_dependencies = [] 701 self.ignored_dependencies = []
702 self.world_target = set() 702 self.world_target = set()
703 self.bbfile_priority = {} 703 self.bbfile_priority = {}
704 self.bbfile_config_priorities = []
705 704
706 def add_from_recipeinfo(self, fn, info_array): 705 def add_from_recipeinfo(self, fn, info_array):
707 for info in info_array: 706 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:
699 699
700 def handleCollections( self, collections ): 700 def handleCollections( self, collections ):
701 """Handle collections""" 701 """Handle collections"""
702 self.status.bbfile_config_priorities = []
702 if collections: 703 if collections:
703 collection_list = collections.split() 704 collection_list = collections.split()
704 for c in collection_list: 705 for c in collection_list:
@@ -769,6 +770,8 @@ class BBCooker:
769 # Parse the configuration here. We need to do it explicitly here since 770 # Parse the configuration here. We need to do it explicitly here since
770 # buildFile() doesn't use the cache 771 # buildFile() doesn't use the cache
771 self.parseConfiguration() 772 self.parseConfiguration()
773 self.status = bb.cache.CacheData(self.caches_array)
774 self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) )
772 775
773 # If we are told to do the None task then query the default task 776 # If we are told to do the None task then query the default task
774 if (task == None): 777 if (task == None):