tinfoil: fix for move of data attribute to cooker
PATCH 1/2 tinfoil: fix for move of data attribute to cooker
Signed-off-by Paul Eggleton <[email protected]>
--- lib/bb/tinfoil.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
lib/bb/tinfoil.py +1 -1
@@ -49,7 +49,7 @@ class Tinfoil: self.config.setConfigParameters(configparams) self.config.setServerRegIdleCallback(self.register_idle_function) self.cooker = BBCooker(self.config) - self.config_data = self.cooker.configuration.data + self.config_data = self.cooker.data bb.providers.logger.setLevel(logging.ERROR) self.cooker_data = None
Signature · 1 line
1.8.1.2
PATCH 2/2 bitbake-layers: fix for move of data object to cooker
Signed-off-by Paul Eggleton <[email protected]>
--- bin/bitbake-layers | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
bin/bitbake-layers +4 -4
@@ -226,7 +226,7 @@ Options: def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only): pkg_pn = self.bbhandler.cooker.recipecache.pkg_pn - (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.recipecache, pkg_pn) + (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.config_data, self.bbhandler.cooker.recipecache, pkg_pn) allproviders = bb.providers.allProviders(self.bbhandler.cooker.recipecache) # Ensure we list skipped recipes
@@ -515,7 +515,7 @@ Recipes are listed with the bbappends that apply to them as subitems. filenames = self.bbhandler.cooker_data.pkg_pn[pn] best = bb.providers.findBestProvider(pn, - self.bbhandler.cooker.configuration.data, + self.bbhandler.config_data, self.bbhandler.cooker_data, self.bbhandler.cooker_data.pkg_pn) best_filename = os.path.basename(best[3])
@@ -598,7 +598,7 @@ The .bbappend file can impact the dependency. for pn in deps: if pn in self.bbhandler.cooker_data.pkg_pn: best = bb.providers.findBestProvider(pn, - self.bbhandler.cooker.configuration.data, + self.bbhandler.config_data, self.bbhandler.cooker_data, self.bbhandler.cooker_data.pkg_pn) self.check_cross_depends("DEPENDS", layername, f, best[3], show_filenames)
@@ -616,7 +616,7 @@ The .bbappend file can impact the dependency. all_p = bb.providers.getRuntimeProviders(self.bbhandler.cooker_data, rdep) if all_p: best = bb.providers.filterProvidersRunTime(all_p, rdep, - self.bbhandler.cooker.configuration.data, + self.bbhandler.config_data, self.bbhandler.cooker_data)[0][0] self.check_cross_depends("RDEPENDS", layername, f, best, show_filenames)
Signature · 1 line
1.8.1.2