diff options
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index b717de51e4..308def020b 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -713,8 +713,6 @@ class BBCooker: | |||
713 | bb.fatal(msg) | 713 | bb.fatal(msg) |
714 | 714 | ||
715 | def buildDepgraph( self ): | 715 | def buildDepgraph( self ): |
716 | all_depends = self.status.all_depends | ||
717 | pn_provides = self.status.pn_provides | ||
718 | 716 | ||
719 | localdata = data.createCopy(self.configuration.data) | 717 | localdata = data.createCopy(self.configuration.data) |
720 | bb.data.update_data(localdata) | 718 | bb.data.update_data(localdata) |
@@ -731,8 +729,7 @@ class BBCooker: | |||
731 | 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]) |
732 | self.status.preferred[providee] = provider | 730 | self.status.preferred[providee] = provider |
733 | 731 | ||
734 | 732 | self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn) | |
735 | self.status.bbfile_priority = self.collection.collection_priorities(self.status.pkg_fn) | ||
736 | 733 | ||
737 | def findCoreBaseFiles(self, subdir, configfile): | 734 | def findCoreBaseFiles(self, subdir, configfile): |
738 | corebase = self.configuration.data.getVar('COREBASE', True) or "" | 735 | corebase = self.configuration.data.getVar('COREBASE', True) or "" |
@@ -858,14 +855,12 @@ class BBCooker: | |||
858 | """ | 855 | """ |
859 | Build package list for "bitbake world" | 856 | Build package list for "bitbake world" |
860 | """ | 857 | """ |
861 | all_depends = self.status.all_depends | ||
862 | pn_provides = self.status.pn_provides | ||
863 | parselog.debug(1, "collating packages for \"world\"") | 858 | parselog.debug(1, "collating packages for \"world\"") |
864 | for f in self.status.possible_world: | 859 | for f in self.status.possible_world: |
865 | terminal = True | 860 | terminal = True |
866 | pn = self.status.pkg_fn[f] | 861 | pn = self.status.pkg_fn[f] |
867 | 862 | ||
868 | for p in pn_provides[pn]: | 863 | for p in self.status.pn_provides[pn]: |
869 | if p.startswith('virtual/'): | 864 | if p.startswith('virtual/'): |
870 | parselog.debug(2, "World build skipping %s due to %s provider starting with virtual/", f, p) | 865 | parselog.debug(2, "World build skipping %s due to %s provider starting with virtual/", f, p) |
871 | terminal = False | 866 | terminal = False |