[Toaster] [PATCH] toaster: buildinfohelper Add additional metadata to the built layer

[Smith, Elliot]

Sent upstream to bitbake-devel and added to toaster-next.

Elliot

On 10 March 2016 at 11:27, Michael Wood <michael.g.wood at intel.com> wrote:

> Add additional metadata to the layer created for build history to be
> able to identify the layer and recipe later on. Specifically this is the
> branch and release to which the recipe and layer are associated with
> enabling differentiation of two recipes which are local release and
> master and 'master' release.
>
> [YOCTO #8528]
> [YOCTO #8545]
>
> Signed-off-by: Michael Wood <michael.g.wood at intel.com>
> ---
>  bitbake/lib/bb/ui/buildinfohelper.py | 31 ++++++++++++++++++++-----------
>  1 file changed, 20 insertions(+), 11 deletions(-)
>
> diff --git a/bitbake/lib/bb/ui/buildinfohelper.py
> b/bitbake/lib/bb/ui/buildinfohelper.py
> index 7fedb76..2dba00a 100644
> --- a/bitbake/lib/bb/ui/buildinfohelper.py
> +++ b/bitbake/lib/bb/ui/buildinfohelper.py
> @@ -358,12 +358,17 @@ class ORMWrapper(object):
>               # create a new copy of this layer version as a snapshot for
>              # historical purposes
> -            layer_copy, c =
> Layer_Version.objects.get_or_create(build=build_obj,
> -                            layer=layer_obj.layer,
> -                            commit=layer_version_information['commit'],
> -                            local_path =
> layer_version_information['local_path'],
> -                            )
> -            logger.info("created new historical layer version %d",
> layer_copy.pk)
> +            layer_copy, c = Layer_Version.objects.get_or_create(
> +                build=build_obj,
> +                layer=layer_obj.layer,
> +                up_branch=layer_obj.up_branch,
> +                branch=layer_version_information['branch'],
> +                commit=layer_version_information['commit'],
> +                local_path=layer_version_information['local_path'],
> +            )
> +
> +            logger.info("created new historical layer version %d",
> +                        layer_copy.pk)
>               self.layer_version_built.append(layer_copy)
>  @@ -584,11 +589,15 @@ class ORMWrapper(object):
>
> packagedict[p]['object'].package_dependencies_target.all().delete()
>
> packagedict[p]['object'].package_dependencies_source.all().delete()
>                  try:
> -                    recipe = self._cached_get(Recipe,
> -                                              name=built_recipe.name,
> -                                              layer_version__build=None,
> - file_path=built_recipe.file_path,
> -
> version=built_recipe.version)
> +                    recipe = self._cached_get(
> +                        Recipe,
> +                        name=built_recipe.name,
> +                        layer_version__build=None,
> +                        layer_version__up_branch=
> +                        built_recipe.layer_version.up_branch,
> +                        file_path=built_recipe.file_path,
> +                        version=built_recipe.version
> +                    )
>                  except (Recipe.DoesNotExist,
>                          Recipe.MultipleObjectsReturned) as e:
>                      logger.info("We did not find one recipe for the"
> --
> 1.9.1
>
> --
> _______________________________________________
> toaster mailing list
> toaster at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster
>



-- 
Elliot Smith
Software Engineer
Intel Open Source Technology Centre
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/toaster/attachments/20160401/82ed64f7/attachment-0001.html>