diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-06-09 11:15:35 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-06-10 10:32:58 +0100 |
commit | 5128f0a8465f574f520282499410446a156fc54d (patch) | |
tree | 2b39881d2d8dc8f42a82aa6b5e71a2a302f70837 /bitbake | |
parent | 8bdbb71f746495b331d4687540d9daa1c8e5d454 (diff) | |
download | poky-5128f0a8465f574f520282499410446a156fc54d.tar.gz |
bitbake: bitbake-layers: fix for move of data object to cooker
(Bitbake rev: 063ee01935767ac4c9518d7477c8c85da1c9969a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-x | bitbake/bin/bitbake-layers | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index ae61239da6..047583c497 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -226,7 +226,7 @@ Options: | |||
226 | 226 | ||
227 | def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only): | 227 | def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only): |
228 | pkg_pn = self.bbhandler.cooker.recipecache.pkg_pn | 228 | pkg_pn = self.bbhandler.cooker.recipecache.pkg_pn |
229 | (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.recipecache, pkg_pn) | 229 | (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.config_data, self.bbhandler.cooker.recipecache, pkg_pn) |
230 | allproviders = bb.providers.allProviders(self.bbhandler.cooker.recipecache) | 230 | allproviders = bb.providers.allProviders(self.bbhandler.cooker.recipecache) |
231 | 231 | ||
232 | # Ensure we list skipped recipes | 232 | # Ensure we list skipped recipes |
@@ -515,7 +515,7 @@ Recipes are listed with the bbappends that apply to them as subitems. | |||
515 | filenames = self.bbhandler.cooker_data.pkg_pn[pn] | 515 | filenames = self.bbhandler.cooker_data.pkg_pn[pn] |
516 | 516 | ||
517 | best = bb.providers.findBestProvider(pn, | 517 | best = bb.providers.findBestProvider(pn, |
518 | self.bbhandler.cooker.configuration.data, | 518 | self.bbhandler.config_data, |
519 | self.bbhandler.cooker_data, | 519 | self.bbhandler.cooker_data, |
520 | self.bbhandler.cooker_data.pkg_pn) | 520 | self.bbhandler.cooker_data.pkg_pn) |
521 | best_filename = os.path.basename(best[3]) | 521 | best_filename = os.path.basename(best[3]) |
@@ -598,7 +598,7 @@ The .bbappend file can impact the dependency. | |||
598 | for pn in deps: | 598 | for pn in deps: |
599 | if pn in self.bbhandler.cooker_data.pkg_pn: | 599 | if pn in self.bbhandler.cooker_data.pkg_pn: |
600 | best = bb.providers.findBestProvider(pn, | 600 | best = bb.providers.findBestProvider(pn, |
601 | self.bbhandler.cooker.configuration.data, | 601 | self.bbhandler.config_data, |
602 | self.bbhandler.cooker_data, | 602 | self.bbhandler.cooker_data, |
603 | self.bbhandler.cooker_data.pkg_pn) | 603 | self.bbhandler.cooker_data.pkg_pn) |
604 | self.check_cross_depends("DEPENDS", layername, f, best[3], show_filenames) | 604 | self.check_cross_depends("DEPENDS", layername, f, best[3], show_filenames) |
@@ -616,7 +616,7 @@ The .bbappend file can impact the dependency. | |||
616 | all_p = bb.providers.getRuntimeProviders(self.bbhandler.cooker_data, rdep) | 616 | all_p = bb.providers.getRuntimeProviders(self.bbhandler.cooker_data, rdep) |
617 | if all_p: | 617 | if all_p: |
618 | best = bb.providers.filterProvidersRunTime(all_p, rdep, | 618 | best = bb.providers.filterProvidersRunTime(all_p, rdep, |
619 | self.bbhandler.cooker.configuration.data, | 619 | self.bbhandler.config_data, |
620 | self.bbhandler.cooker_data)[0][0] | 620 | self.bbhandler.cooker_data)[0][0] |
621 | self.check_cross_depends("RDEPENDS", layername, f, best, show_filenames) | 621 | self.check_cross_depends("RDEPENDS", layername, f, best, show_filenames) |
622 | 622 | ||