diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 18:00:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-12 18:00:39 +0100 |
| commit | 0a9cbe7a6a17c5df38cd442ee8650097d6bbf502 (patch) | |
| tree | c9aade604318b5e87affd6bd71f08118bd74bfc2 /bin | |
| parent | db307fc68773868de2db614a061f51c5c6a90468 (diff) | |
| download | bitbake-0a9cbe7a6a17c5df38cd442ee8650097d6bbf502.tar.gz | |
bitbake-layers/tinfoil: Catch up with status -> recpiecache rename
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/bitbake-layers | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers index 86da2689e..06156e6a8 100755 --- a/bin/bitbake-layers +++ b/bin/bitbake-layers @@ -89,7 +89,7 @@ class Commands(cmd.Cmd): for layerdir in self.bblayers: layername = self.get_layer_name(layerdir) layerpri = 0 - for layer, _, regex, pri in self.bbhandler.cooker.status.bbfile_config_priorities: + for layer, _, regex, pri in self.bbhandler.cooker.recpiecache.bbfile_config_priorities: if regex.match(os.path.join(layerdir, 'test')): layerpri = pri break @@ -225,9 +225,9 @@ 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.status.pkg_pn - (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.status, pkg_pn) - allproviders = bb.providers.allProviders(self.bbhandler.cooker.status) + pkg_pn = self.bbhandler.cooker.recpiecache.pkg_pn + (latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.recpiecache, pkg_pn) + allproviders = bb.providers.allProviders(self.bbhandler.cooker.recpiecache) # Ensure we list skipped recipes # 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). # have come from) first_regex = None layerdir = layers[0] - for layername, pattern, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: + for layername, pattern, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities: if regex.match(os.path.join(layerdir, 'test')): first_regex = regex break @@ -456,7 +456,7 @@ build results (as the layer priority order has effectively changed). 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) def get_file_layer(self, filename): - for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: + for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities: if regex.match(filename): for layerdir in self.bblayers: 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). return "?" def get_file_layerdir(self, filename): - for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities: + for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities: if regex.match(filename): for layerdir in self.bblayers: if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename): |