diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 7 |
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 | ||
