summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbitbake/bin/bitbake-layers14
-rw-r--r--bitbake/lib/bb/tinfoil.py4
2 files changed, 9 insertions, 9 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 86da2689e6..06156e6a88 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -89,7 +89,7 @@ class Commands(cmd.Cmd):
89 for layerdir in self.bblayers: 89 for layerdir in self.bblayers:
90 layername = self.get_layer_name(layerdir) 90 layername = self.get_layer_name(layerdir)
91 layerpri = 0 91 layerpri = 0
92 for layer, _, regex, pri in self.bbhandler.cooker.status.bbfile_config_priorities: 92 for layer, _, regex, pri in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
93 if regex.match(os.path.join(layerdir, 'test')): 93 if regex.match(os.path.join(layerdir, 'test')):
94 layerpri = pri 94 layerpri = pri
95 break 95 break
@@ -225,9 +225,9 @@ Options:
225 225
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.status.pkg_pn 228 pkg_pn = self.bbhandler.cooker.recpiecache.pkg_pn
229 (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.status, pkg_pn) 229 (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.recpiecache, pkg_pn)
230 allproviders = bb.providers.allProviders(self.bbhandler.cooker.status) 230 allproviders = bb.providers.allProviders(self.bbhandler.cooker.recpiecache)
231 231
232 # Ensure we list skipped recipes 232 # Ensure we list skipped recipes
233 # We are largely guessing about PN, PV and the preferred version here, 233 # We are largely guessing about PN, PV and the preferred version here,
@@ -426,7 +426,7 @@ build results (as the layer priority order has effectively changed).
426 # have come from) 426 # have come from)
427 first_regex = None 427 first_regex = None
428 layerdir = layers[0] 428 layerdir = layers[0]
429 for layername, pattern, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: 429 for layername, pattern, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
430 if regex.match(os.path.join(layerdir, 'test')): 430 if regex.match(os.path.join(layerdir, 'test')):
431 first_regex = regex 431 first_regex = regex
432 break 432 break
@@ -456,7 +456,7 @@ build results (as the layer priority order has effectively changed).
456 logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full) 456 logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full)
457 457
458 def get_file_layer(self, filename): 458 def get_file_layer(self, filename):
459 for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: 459 for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
460 if regex.match(filename): 460 if regex.match(filename):
461 for layerdir in self.bblayers: 461 for layerdir in self.bblayers:
462 if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename): 462 if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
@@ -464,7 +464,7 @@ build results (as the layer priority order has effectively changed).
464 return "?" 464 return "?"
465 465
466 def get_file_layerdir(self, filename): 466 def get_file_layerdir(self, filename):
467 for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: 467 for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
468 if regex.match(filename): 468 if regex.match(filename):
469 for layerdir in self.bblayers: 469 for layerdir in self.bblayers:
470 if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename): 470 if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py
index cb53f3e54f..3379853628 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -71,13 +71,13 @@ class Tinfoil:
71 self.logger.setLevel(logging.INFO) 71 self.logger.setLevel(logging.INFO)
72 sys.stderr.write("done.\n") 72 sys.stderr.write("done.\n")
73 73
74 self.cooker_data = self.cooker.status 74 self.cooker_data = self.cooker.recpiecache
75 75
76 def prepare(self, config_only = False): 76 def prepare(self, config_only = False):
77 if not self.cooker_data: 77 if not self.cooker_data:
78 if config_only: 78 if config_only:
79 self.cooker.parseConfiguration() 79 self.cooker.parseConfiguration()
80 self.cooker_data = self.cooker.status 80 self.cooker_data = self.cooker.recpiecache
81 else: 81 else:
82 self.parseRecipes() 82 self.parseRecipes()
83 83