[oe] [meta-handheld][PATCH] meta-handheld: append to BBPATH instead of prepend so order of bblayers.conf is respected

[Paul Eggleton]

On Saturday 16 June 2012 21:40:18 Martin Jansa wrote:
> On Sat, Jun 16, 2012 at 09:37:56PM +0200, Martin Jansa wrote:
> > On Sat, Jun 16, 2012 at 08:28:28PM +0100, Paul Eggleton wrote:
> > > On Saturday 16 June 2012 09:01:17 Martin Jansa wrote:
> > > > On Wed, May 23, 2012 at 05:50:37PM +0200, Martin Jansa wrote:
> > > > > Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> > > > 
> > > > ping
> > > > 
> > > > > ---
> > > > > 
> > > > >  conf/layer.conf |   11 ++++++++---
> > > > >  1 files changed, 8 insertions(+), 3 deletions(-)
> > > > > 
> > > > > diff --git a/conf/layer.conf b/conf/layer.conf
> > > > > index 7a2441b..31dcb16 100644
> > > > > --- a/conf/layer.conf
> > > > > +++ b/conf/layer.conf
> > > > > @@ -1,13 +1,18 @@
> > > > > 
> > > > >  # Layer configuration for meta-handheld layer
> > > > >  # Copyright 2011 Intel Corporation
> > > > > 
> > > > > -# We have a conf and classes directory, prepend to BBPATH to prefer
> > > > > our
> > > > > versions -BBPATH := "${LAYERDIR}:${BBPATH}"
> > > > > +# We have a conf and classes directory, append to BBPATH
> > > > > +BBPATH .= ":${LAYERDIR}"
> > > > > 
> > > > >  # We have a recipes directory, add to BBFILES
> > > > > 
> > > > > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb
> > > > > ${LAYERDIR}/recipes-*/*/*.bbappend"
> > > > > +BBFILES +=
> > > > > "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend">
> > > > > 
> > > > >  BBFILE_COLLECTIONS += "meta-handheld"
> > > > >  BBFILE_PATTERN_meta-handheld := "^${LAYERDIR}/"
> > > 
> > > I was all set to apply this now (sorry for the delay) and then I noticed
> > > you changed the above without comment - why was that?
> > 
> > Just to match what other layers do, or is there some advantage of using
> > 
> > := instead of += in BBFILES?
> 
> And IIRC there was some discussion about BBFILES :=/+= on ML before
> ba31e4eabd31af63eb0244096c8bcdcac185fac6 changed it in other layers.

Hmm, I couldn't find that discussion, but it doesn't seem to behave any 
differently; but looking at BitBake's layer.conf handling code we explicitly 
expand the LAYERDIR reference immediately anyway, so immediate expansion (:=) 
doesn't do anything. I guess this means the += form is perhaps preferred since 
it makes what we are trying to do more obvious.

Now I've understood the above I've merged this patch, thanks.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre