From 853280f161ed24f9b976a6f53739c08ac2362ddb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 14 Mar 2008 11:44:34 +0000 Subject: bitbake: Update with changes from bitbake 1.8 branch git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4006 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake/lib/bb/cooker.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'bitbake/lib/bb/cooker.py') diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 38a820976..619791f17 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py @@ -473,11 +473,11 @@ class BBCooker: # Load data into the cache for fn self.bb_cache = bb.cache.init(self) - self.bb_cache.loadData(fn, self.configuration.data) + self.bb_cache.loadData(fn, self.configuration.data) # Parse the loaded cache data self.status = bb.cache.CacheData() - self.bb_cache.handle_data(fn, self.status) + self.bb_cache.handle_data(fn, self.status) # Tweak some variables item = self.bb_cache.getVar('PN', fn, True) @@ -493,7 +493,7 @@ class BBCooker: # Remove stamp for target if force mode active if self.configuration.force: bb.msg.note(2, bb.msg.domain.RunQueue, "Remove stamp %s, %s" % (self.configuration.cmd, fn)) - bb.build.del_stamp('do_%s' % self.configuration.cmd, bbfile_data) + bb.build.del_stamp('do_%s' % self.configuration.cmd, self.configuration.data) # Setup taskdata structure taskdata = bb.taskdata.TaskData(self.configuration.abort) @@ -573,6 +573,7 @@ class BBCooker: bb.msg.debug(1, bb.msg.domain.Collection, "collecting .bb files") (filelist, masked) = self.collect_bbfiles() + bb.data.renameVar("__depends", "__base_depends", self.configuration.data) self.parse_bbfiles(filelist, masked, self.myProgressCallback) bb.msg.debug(1, bb.msg.domain.Collection, "parsing complete") -- cgit v1.2.3