diff options
author | Michael Wood <michael.g.wood@intel.com> | 2015-12-02 10:02:52 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-07 17:37:10 +0000 |
commit | 53e981e583cb15f59e86453b449688a38268912e (patch) | |
tree | 826c9b31fca132249a3db35265fef4ad90edf924 /bitbake | |
parent | 57e5f24e57caf40007459015bb47801561c779ce (diff) | |
download | poky-53e981e583cb15f59e86453b449688a38268912e.tar.gz |
bitbake: toaster: buildinfohelper Broaden the toaster created recipe data case
When build information is the 'original' source of the information we
need to return the recipe that was created rather than the copy of the
recipe that is taken for keeping build history. We do this already for
command line triggered builds, but we also have this case for custom
images. We can simply check if the built_recipe exists instead of
special casing this.
(Bitbake rev: 9a8653bf602b2111dee7ee6a459682a68a695b22)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: brian avery <avery.brian@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index 2b9302d108..5ea9284a39 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/lib/bb/ui/buildinfohelper.py | |||
@@ -304,12 +304,11 @@ class ORMWrapper(object): | |||
304 | break | 304 | break |
305 | 305 | ||
306 | 306 | ||
307 | # If we're in analysis mode then we are wholly responsible for the data | 307 | # If we're in analysis mode or if this is a custom recipe |
308 | # then we are wholly responsible for the data | ||
308 | # and therefore we return the 'real' recipe rather than the build | 309 | # and therefore we return the 'real' recipe rather than the build |
309 | # history copy of the recipe. | 310 | # history copy of the recipe. |
310 | if recipe_information['layer_version'].build is not None and \ | 311 | if built_recipe is None: |
311 | recipe_information['layer_version'].build.project == \ | ||
312 | Project.objects.get_default_project(): | ||
313 | return recipe | 312 | return recipe |
314 | 313 | ||
315 | return built_recipe | 314 | return built_recipe |