From cbaab65ff4bb3e4fc77066032a8858f4d5d61241 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 30 Sep 2008 16:54:37 +0000 Subject: Merge changes from Poky bitbake 1.8 Update bitbake-dev to have extra fixes from Poky's internal (1.8) version of bitbake. Should be able to use bitbake-dev with Poky now. git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5340 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- bitbake-dev/lib/bb/cooker.py | 1 + 1 file changed, 1 insertion(+) (limited to 'bitbake-dev/lib/bb/cooker.py') diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index c92ad70a2..8eb1a410f 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py @@ -758,6 +758,7 @@ class BBCooker: self.handleCollections( bb.data.getVar("BBFILE_COLLECTIONS", self.configuration.data, 1) ) bb.msg.debug(1, bb.msg.domain.Collection, "collecting .bb files") + bb.data.renameVar("__depends", "__base_depends", self.configuration.data) (filelist, masked) = self.collect_bbfiles() self.parse_bbfiles(filelist, masked) bb.msg.debug(1, bb.msg.domain.Collection, "parsing complete") -- cgit v1.2.3