[yocto] [meta-intel][PATCH] layer.conf: Use .= for adding to BBPATH and += to BBFILES

Mon Jan 7 09:31:25 PST 2013

On Mon, 2013-01-07 at 08:08 -0800, Darren Hart wrote:
> Hi Khem,
> 
> On 01/03/2013 07:50 PM, Khem Raj wrote:
> > Fixes parsing errors which is appearing after this commit to
> > meta-openembedded
> > 
> > http://cgit.openembedded.org/meta-openembedded/commit/?id=3c21a46020bd0816579648f684c41dbd6333583e
> > 
> > This triggers
> > exception NameError: name 'base_contains' is not defined
> > without this change
> 
> OK, so your solution is to avoid the immediate expansion operator (:=)
> which caused base_contains added in the previous commit to fail to
> expand at the time the meta-intel layer configs are parsed
> and replace it with one of the append operators (.= or +=) that allows
> for delayed variable expansion. This seems correct to me - but please
> include this explanation in your commit message in the future.
> 
> Also, please use the meta-intel mailing list for changes to meta-intel
> (Cc'd now).
> https://lists.yoctoproject.org/listinfo/meta-intel
> 
> Tom, any objection?
> 

No, the changes look fine to me.

Acked-by: Tom Zanussi <tom.zanussi at intel.com>

> 
> > 
> > Signed-off-by: Khem Raj <raj.khem at gmail.com>
> 
> 
> Acked-by: Darren Hart <dvhart at linux.intel.com>
> 
> 
> > ---
> >  conf/layer.conf                    |    4 ++--
> >  meta-cedartrail/conf/layer.conf    |    4 ++--
> >  meta-chiefriver/conf/layer.conf    |    4 ++--
> >  meta-crownbay/conf/layer.conf      |    4 ++--
> >  meta-crystalforest/conf/layer.conf |    4 ++--
> >  meta-emenlow/conf/layer.conf       |    4 ++--
> >  meta-fri2/conf/layer.conf          |    4 ++--
> >  meta-jasperforest/conf/layer.conf  |    4 ++--
> >  meta-n450/conf/layer.conf          |    4 ++--
> >  meta-nuc/conf/layer.conf           |    4 ++--
> >  meta-romley/conf/layer.conf        |    4 ++--
> >  meta-sugarbay/conf/layer.conf      |    4 ++--
> >  meta-sys940x/conf/layer.conf       |    4 ++--
> >  meta-tlk/conf/layer.conf           |    4 ++--
> >  14 files changed, 28 insertions(+), 28 deletions(-)
> > 
> > diff --git a/conf/layer.conf b/conf/layer.conf
> > index e9c2b10..31132ab 100644
> > --- a/conf/layer.conf
> > +++ b/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have recipes-* directories, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
> >              ${LAYERDIR}/common/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "intel"
> > diff --git a/meta-cedartrail/conf/layer.conf b/meta-cedartrail/conf/layer.conf
> > index c19c4c1..0166b35 100644
> > --- a/meta-cedartrail/conf/layer.conf
> > +++ b/meta-cedartrail/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "cedartrail"
> > diff --git a/meta-chiefriver/conf/layer.conf b/meta-chiefriver/conf/layer.conf
> > index 5dc3c02..6164f99 100644
> > --- a/meta-chiefriver/conf/layer.conf
> > +++ b/meta-chiefriver/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "chiefriver"
> > diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
> > index cb17298..e6cc2a0 100644
> > --- a/meta-crownbay/conf/layer.conf
> > +++ b/meta-crownbay/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "crownbay"
> > diff --git a/meta-crystalforest/conf/layer.conf b/meta-crystalforest/conf/layer.conf
> > index 6b802d6..daa2ba7 100644
> > --- a/meta-crystalforest/conf/layer.conf
> > +++ b/meta-crystalforest/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "crystalforest"
> > diff --git a/meta-emenlow/conf/layer.conf b/meta-emenlow/conf/layer.conf
> > index a49ec47..b5832e4 100644
> > --- a/meta-emenlow/conf/layer.conf
> > +++ b/meta-emenlow/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have recipes-* directories, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "emenlow"
> > diff --git a/meta-fri2/conf/layer.conf b/meta-fri2/conf/layer.conf
> > index 4d140f9..0bb29a1 100644
> > --- a/meta-fri2/conf/layer.conf
> > +++ b/meta-fri2/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "fri2"
> > diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
> > index 09f1647..b539733 100644
> > --- a/meta-jasperforest/conf/layer.conf
> > +++ b/meta-jasperforest/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES .= "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "jasperforest"
> > diff --git a/meta-n450/conf/layer.conf b/meta-n450/conf/layer.conf
> > index 4481121..ee53e54 100644
> > --- a/meta-n450/conf/layer.conf
> > +++ b/meta-n450/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have recipes-* directories, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "n450"
> > diff --git a/meta-nuc/conf/layer.conf b/meta-nuc/conf/layer.conf
> > index fb5b58a..174411f 100644
> > --- a/meta-nuc/conf/layer.conf
> > +++ b/meta-nuc/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "nuc"
> > diff --git a/meta-romley/conf/layer.conf b/meta-romley/conf/layer.conf
> > index 8ce1a4d..7b6a5bc 100644
> > --- a/meta-romley/conf/layer.conf
> > +++ b/meta-romley/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "romley"
> > diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
> > index eb8ec45..9576330 100644
> > --- a/meta-sugarbay/conf/layer.conf
> > +++ b/meta-sugarbay/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "sugarbay"
> > diff --git a/meta-sys940x/conf/layer.conf b/meta-sys940x/conf/layer.conf
> > index 5d588ad..b14be6d 100644
> > --- a/meta-sys940x/conf/layer.conf
> > +++ b/meta-sys940x/conf/layer.conf
> > @@ -1,8 +1,8 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have a recipes directory, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> >  BBFILE_COLLECTIONS += "sys940x"
> > diff --git a/meta-tlk/conf/layer.conf b/meta-tlk/conf/layer.conf
> > index fc0da61..38b0e0c 100644
> > --- a/meta-tlk/conf/layer.conf
> > +++ b/meta-tlk/conf/layer.conf
> > @@ -1,6 +1,6 @@
> >  # We have a conf and classes directory, add to BBPATH
> > -BBPATH := "${BBPATH}:${LAYERDIR}"
> > +BBPATH .= ":${LAYERDIR}"
> >  
> >  # We have recipes-* directories, add to BBFILES
> > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> > 
> 