[OE-core] [PATCH] buildhistory.bbclass: metadata-revs show repo parent

[Trevor Woerner]

On 03/11/16 22:59, Khem Raj wrote:
>
>
> On Mar 12, 2016 9:50 AM, "Trevor Woerner" <twoerner at gmail.com 
> <mailto:twoerner at gmail.com>> wrote:
> >
> > Currently my build shows two "meta" repositories: one from meta-poky 
> and one
> > from openembedded-core. Have the code which prints the repositories into
> > metadata-revs show the parent directories when repositories with 
> multiple
> > sub-layers are used.
>
> Meta-poky is a leaf layer. So how is it offering conflicting meta layer ?
>

There's no conflict, I'm just trying to generate output the 
differentiates amongst leaf layers in its output.

Before:
     meta              = master:00d3fd571a8d261d065b43f5cf3076a381843984
     meta-oe           = master:a1e135a499998add7575682bf53db5e02e753580
     meta-gnome        = master:a1e135a499998add7575682bf53db5e02e753580
     meta-rpb          = master:203903ca6f4e8df09bef6ea3c6e899d07eca8df9
     meta-96boards     = master:2be59f0d381b5ec173d7fc24f3ae14aaf47b8649
     meta-qcom         = master:32fcda819acb8ec485d9ab05108d554f807bf75d
     meta-browser      = master:a3789a4168fcd42f1cdf5b5febe2c779a9467919
     meta-linaro-toolchain = master:367f784b831938dc508b7d472342d2d0d6ed9769
     meta              = master:37b61b059031e3c272a929b834e12fd83f46598c
     meta-poky         = master:37b61b059031e3c272a929b834e12fd83f46598c

After:
     openembedded-core/meta = 
master:00d3fd571a8d261d065b43f5cf3076a381843984
     meta-openembedded/meta-oe = 
master:a1e135a499998add7575682bf53db5e02e753580
     meta-openembedded/meta-gnome = 
master:a1e135a499998add7575682bf53db5e02e753580
     meta-rpb          = master:203903ca6f4e8df09bef6ea3c6e899d07eca8df9
     meta-96boards     = master:2be59f0d381b5ec173d7fc24f3ae14aaf47b8649
     meta-qcom         = master:32fcda819acb8ec485d9ab05108d554f807bf75d
     meta-browser      = master:a3789a4168fcd42f1cdf5b5febe2c779a9467919
     meta-linaro/meta-linaro-toolchain = 
master:367f784b831938dc508b7d472342d2d0d6ed9769
     meta-poky/meta    = master:37b61b059031e3c272a929b834e12fd83f46598c
     meta-poky/meta-poky = master:37b61b059031e3c272a929b834e12fd83f46598c

So you see how it prints the parent layer for any leaf layers, which is 
more descriptive (and better?).





> >
> > Signed-off-by: Trevor Woerner <twoerner at gmail.com 
> <mailto:twoerner at gmail.com>>
> > ---
> >  meta/classes/buildhistory.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/buildhistory.bbclass 
> b/meta/classes/buildhistory.bbclass
> > index fac7fed..b6b4324 100644
> > --- a/meta/classes/buildhistory.bbclass
> > +++ b/meta/classes/buildhistory.bbclass
> > @@ -616,7 +616,7 @@ def buildhistory_get_build_id(d):
> >  def buildhistory_get_metadata_revs(d):
> >      # We want an easily machine-readable format here, so 
> get_layers_branch_rev isn't quite what we want
> >      layers = (d.getVar("BBLAYERS", True) or "").split()
> > -    medadata_revs = ["%-17s = %s:%s" % (os.path.basename(i), \
> > +    medadata_revs = ["%-17s = %s:%s" % (os.path.relpath(i, 
> d.getVar('BBLAYERS_FETCH_DIR', True)), \
> >          base_get_metadata_git_branch(i, None).strip(), \
> >          base_get_metadata_git_revision(i, None)) \
> >              for i in layers]
> > --
> > 2.7.0.rc3
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org 
> <mailto:Openembedded-core at lists.openembedded.org>
> > http://lists.openembedded.org/mailman/listinfo/openembedded-core
>