summaryrefslogtreecommitdiff
path: root/bitbake-dev/lib/bb/cooker.py
diff options
context:
space:
mode:
authorJoshua Lock <josh@openedhand.com>2008-09-30 16:54:37 +0000
committerJoshua Lock <josh@openedhand.com>2008-09-30 16:54:37 +0000
commitcbaab65ff4bb3e4fc77066032a8858f4d5d61241 (patch)
tree393dcbb8a980e4d8c0c9d9db4eb3405e9c7f5f90 /bitbake-dev/lib/bb/cooker.py
parentd54280dd315810ad8cdbce5c52a1af3de902f6ef (diff)
downloadopenembedded-core-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.tar.gz
openembedded-core-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.tar.bz2
openembedded-core-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.tar.xz
openembedded-core-cbaab65ff4bb3e4fc77066032a8858f4d5d61241.zip
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
Diffstat (limited to 'bitbake-dev/lib/bb/cooker.py')
-rw-r--r--bitbake-dev/lib/bb/cooker.py1
1 files changed, 1 insertions, 0 deletions
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")