diff options
| author | Michael Wood <michael.g.wood@intel.com> | 2015-10-07 14:55:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-11 05:39:03 +0100 |
| commit | 97d000677eb3d28c7f88f93a0c3c5154c3df32ad (patch) | |
| tree | 2ec723b58fa2e010c57b956da3512835d742b1cb | |
| parent | 0dcc96323cbe1c700e241fbe488ea0da3fec3918 (diff) | |
| download | poky-97d000677eb3d28c7f88f93a0c3c5154c3df32ad.tar.gz | |
bitbake: toaster: buildinfohelper associate build data with built_recipe
Make sure we associate build data with the built recipe rather than
toaster's configuration copy of the recipe.
(Bitbake rev: 34d4ef7289d72d151ad0acdccab8b99c8c31221e)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 9fdde29e14..fc59c57d02 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
| @@ -286,6 +286,7 @@ class ORMWrapper(object): | |||
| 286 | 286 | ||
| 287 | update_recipe_obj(recipe) | 287 | update_recipe_obj(recipe) |
| 288 | 288 | ||
| 289 | built_recipe = None | ||
| 289 | # Create a copy of the recipe for historical puposes and update it | 290 | # Create a copy of the recipe for historical puposes and update it |
| 290 | for built_layer in self.layer_version_built: | 291 | for built_layer in self.layer_version_built: |
| 291 | if built_layer.layer == recipe_information['layer_version'].layer: | 292 | if built_layer.layer == recipe_information['layer_version'].layer: |
| @@ -301,7 +302,7 @@ class ORMWrapper(object): | |||
| 301 | if created and must_exist: | 302 | if created and must_exist: |
| 302 | raise NotExisting("Recipe object created when expected to exist", recipe_information) | 303 | raise NotExisting("Recipe object created when expected to exist", recipe_information) |
| 303 | 304 | ||
| 304 | return recipe | 305 | return built_recipe |
| 305 | 306 | ||
| 306 | def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information): | 307 | def get_update_layer_version_object(self, build_obj, layer_obj, layer_version_information): |
| 307 | if isinstance(layer_obj, Layer_Version): | 308 | if isinstance(layer_obj, Layer_Version): |
