summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-10 15:26:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-12 08:26:15 +0100
commit9ed7cd13fd720731180e2a8b6e6caddab3da2310 (patch)
tree58a67ff43d43aac85c89f7579916671cef269823 /bitbake
parent8c7a23ed3fe9943b732149ebedaf206a1e22c022 (diff)
downloadpoky-9ed7cd13fd720731180e2a8b6e6caddab3da2310.tar.gz
bitbake: cooker: Rename confusing buildDepgraph task to handlePrefProviders
(Bitbake rev: a25722175bf61f22961f45dbd356cb6d79864b35) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/cooker.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 308def020b..2b55617e87 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -712,7 +712,7 @@ class BBCooker:
712 else: 712 else:
713 bb.fatal(msg) 713 bb.fatal(msg)
714 714
715 def buildDepgraph( self ): 715 def handlePrefProviders(self):
716 716
717 localdata = data.createCopy(self.configuration.data) 717 localdata = data.createCopy(self.configuration.data)
718 bb.data.update_data(localdata) 718 bb.data.update_data(localdata)
@@ -729,8 +729,6 @@ class BBCooker:
729 providerlog.error("conflicting preferences for %s: both %s and %s specified", providee, provider, self.status.preferred[providee]) 729 providerlog.error("conflicting preferences for %s: both %s and %s specified", providee, provider, self.status.preferred[providee])
730 self.status.preferred[providee] = provider 730 self.status.preferred[providee] = provider
731 731
732 self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn)
733
734 def findCoreBaseFiles(self, subdir, configfile): 732 def findCoreBaseFiles(self, subdir, configfile):
735 corebase = self.configuration.data.getVar('COREBASE', True) or "" 733 corebase = self.configuration.data.getVar('COREBASE', True) or ""
736 paths = [] 734 paths = []
@@ -1299,7 +1297,8 @@ class BBCooker:
1299 if self.parser.error: 1297 if self.parser.error:
1300 sys.exit(1) 1298 sys.exit(1)
1301 self.show_appends_with_no_recipes() 1299 self.show_appends_with_no_recipes()
1302 self.buildDepgraph() 1300 self.handlePrefProviders()
1301 self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn)
1303 self.state = state.running 1302 self.state = state.running
1304 return None 1303 return None
1305 1304