All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 0/1] meta-intel BBFILE_COLLECTIONS fixups
@ 2011-05-26 15:40 tom.zanussi
  2011-05-26 15:40 ` [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides tom.zanussi
  0 siblings, 1 reply; 6+ messages in thread
From: tom.zanussi @ 2011-05-26 15:40 UTC (permalink / raw)
  To: yocto

From: Tom Zanussi <tom.zanussi@intel.com>

This fixes a problem with BBFILE_COLLECTIONS reported by Jeremy Puhlman.

The following changes since commit 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812:
  Tom Zanussi (1):
        meta-sugarbay: remove xserver-xf86-dri-lite bbappend

are available in the git repository at:

  git://git.pokylinux.org/meta-intel.git tzanussi/bbfile-collections-fix
  http://git.pokylinux.org/cgit.cgi//log/?h=tzanussi/bbfile-collections-fix

Tom Zanussi (1):
  meta-intel: fix BBFILE_COLLECTIONS overrides

 meta-crownbay/conf/layer.conf     |    4 ++--
 meta-fishriver/conf/layer.conf    |    2 +-
 meta-jasperforest/conf/layer.conf |    2 +-
 meta-sugarbay/conf/layer.conf     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)



^ permalink raw reply	[flat|nested] 6+ messages in thread
* [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
  2011-05-26 15:40 [PATCH 0/1] meta-intel BBFILE_COLLECTIONS fixups tom.zanussi
@ 2011-05-26 15:40 ` tom.zanussi
  2011-05-27 21:55   ` Darren Hart
  0 siblings, 1 reply; 6+ messages in thread
From: tom.zanussi @ 2011-05-26 15:40 UTC (permalink / raw)
  To: yocto

From: Tom Zanussi <tom.zanussi@intel.com>

Several BBFILE_COLLECTIONS assignments in the layer.confs for these
meta-intel layers added unwanted machine overrides, resulting in
truncated values for this variable - remove them.

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
 meta-crownbay/conf/layer.conf     |    4 ++--
 meta-fishriver/conf/layer.conf    |    2 +-
 meta-jasperforest/conf/layer.conf |    2 +-
 meta-sugarbay/conf/layer.conf     |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
index cee4ba2..d15579d 100644
--- a/meta-crownbay/conf/layer.conf
+++ b/meta-crownbay/conf/layer.conf
@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_crownbay += "crownbay"
+BBFILE_COLLECTIONS_append_crownbay += "crownbay"
 BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_crownbay = "6"
 
-BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd"
+BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
 BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
 BBFILE_PRIORITY_crownbay-noemgd = "6"
diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
index 595bbe3..9162b5e 100644
--- a/meta-fishriver/conf/layer.conf
+++ b/meta-fishriver/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_fishriver += "fishriver"
+BBFILE_COLLECTIONS += "fishriver"
 BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
 BBFILE_PRIORITY_fishriver = "6"
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
index 564bb1d..8125659 100644
--- a/meta-jasperforest/conf/layer.conf
+++ b/meta-jasperforest/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_jasperforest += "jasperforest"
+BBFILE_COLLECTIONS += "jasperforest"
 BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
 BBFILE_PRIORITY_jasperforest = "6"
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
index e23d123..d5f78e1 100644
--- a/meta-sugarbay/conf/layer.conf
+++ b/meta-sugarbay/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bb \
 	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
 
-BBFILE_COLLECTIONS_sugarbay += "sugarbay"
+BBFILE_COLLECTIONS += "sugarbay"
 BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
 BBFILE_PRIORITY_sugarbay = "6"
-- 
1.7.0.4



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
  2011-05-26 15:40 ` [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides tom.zanussi
@ 2011-05-27 21:55   ` Darren Hart
  2011-05-27 22:01     ` Tom Zanussi
  0 siblings, 1 reply; 6+ messages in thread
From: Darren Hart @ 2011-05-27 21:55 UTC (permalink / raw)
  To: tom.zanussi; +Cc: yocto



On 05/26/2011 08:40 AM, tom.zanussi@intel.com wrote:
> From: Tom Zanussi <tom.zanussi@intel.com>
> 
> Several BBFILE_COLLECTIONS assignments in the layer.confs for these
> meta-intel layers added unwanted machine overrides, resulting in
> truncated values for this variable - remove them.

Why the difference between crownbay and the other BSPs? Crownbay uses
_append.

--
Darren

> 
> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> ---
>  meta-crownbay/conf/layer.conf     |    4 ++--
>  meta-fishriver/conf/layer.conf    |    2 +-
>  meta-jasperforest/conf/layer.conf |    2 +-
>  meta-sugarbay/conf/layer.conf     |    2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
> index cee4ba2..d15579d 100644
> --- a/meta-crownbay/conf/layer.conf
> +++ b/meta-crownbay/conf/layer.conf
> @@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
>  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
>  	${LAYERDIR}/recipes-*/*/*.bbappend"
>  
> -BBFILE_COLLECTIONS_crownbay += "crownbay"
> +BBFILE_COLLECTIONS_append_crownbay += "crownbay"
>  BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_crownbay = "6"
>  
> -BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd"
> +BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
>  BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_crownbay-noemgd = "6"
> diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
> index 595bbe3..9162b5e 100644
> --- a/meta-fishriver/conf/layer.conf
> +++ b/meta-fishriver/conf/layer.conf
> @@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
>  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
>  	${LAYERDIR}/recipes-*/*/*.bbappend"
>  
> -BBFILE_COLLECTIONS_fishriver += "fishriver"
> +BBFILE_COLLECTIONS += "fishriver"
>  BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_fishriver = "6"
> diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
> index 564bb1d..8125659 100644
> --- a/meta-jasperforest/conf/layer.conf
> +++ b/meta-jasperforest/conf/layer.conf
> @@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
>  	${LAYERDIR}/../common/recipes-*/*/*.bb \
>  	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
>  
> -BBFILE_COLLECTIONS_jasperforest += "jasperforest"
> +BBFILE_COLLECTIONS += "jasperforest"
>  BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_jasperforest = "6"
> diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
> index e23d123..d5f78e1 100644
> --- a/meta-sugarbay/conf/layer.conf
> +++ b/meta-sugarbay/conf/layer.conf
> @@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
>  	${LAYERDIR}/../common/recipes-*/*/*.bb \
>  	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
>  
> -BBFILE_COLLECTIONS_sugarbay += "sugarbay"
> +BBFILE_COLLECTIONS += "sugarbay"
>  BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
>  BBFILE_PRIORITY_sugarbay = "6"

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel


^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
  2011-05-27 21:55   ` Darren Hart
@ 2011-05-27 22:01     ` Tom Zanussi
  2011-05-27 22:18       ` Jeremy Puhlman
  0 siblings, 1 reply; 6+ messages in thread
From: Tom Zanussi @ 2011-05-27 22:01 UTC (permalink / raw)
  To: Darren Hart; +Cc: yocto

On Fri, 2011-05-27 at 14:55 -0700, Darren Hart wrote:
> 
> On 05/26/2011 08:40 AM, tom.zanussi@intel.com wrote:
> > From: Tom Zanussi <tom.zanussi@intel.com>
> > 
> > Several BBFILE_COLLECTIONS assignments in the layer.confs for these
> > meta-intel layers added unwanted machine overrides, resulting in
> > truncated values for this variable - remove them.
> 
> Why the difference between crownbay and the other BSPs? Crownbay uses
> _append.
> 

The crownbay has two BBFILE_COLLECTIONS in the same file, one for
crownbay and one for crownbay-noemgd.  The conditional append allows
them to be selected based on the machine selected.

Tom

> --
> Darren
> 
> > 
> > Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
> > ---
> >  meta-crownbay/conf/layer.conf     |    4 ++--
> >  meta-fishriver/conf/layer.conf    |    2 +-
> >  meta-jasperforest/conf/layer.conf |    2 +-
> >  meta-sugarbay/conf/layer.conf     |    2 +-
> >  4 files changed, 5 insertions(+), 5 deletions(-)
> > 
> > diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
> > index cee4ba2..d15579d 100644
> > --- a/meta-crownbay/conf/layer.conf
> > +++ b/meta-crownbay/conf/layer.conf
> > @@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
> >  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> > -BBFILE_COLLECTIONS_crownbay += "crownbay"
> > +BBFILE_COLLECTIONS_append_crownbay += "crownbay"
> >  BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_crownbay = "6"
> >  
> > -BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd"
> > +BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
> >  BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_crownbay-noemgd = "6"
> > diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
> > index 595bbe3..9162b5e 100644
> > --- a/meta-fishriver/conf/layer.conf
> > +++ b/meta-fishriver/conf/layer.conf
> > @@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
> >  BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/recipes-*/*/*.bbappend"
> >  
> > -BBFILE_COLLECTIONS_fishriver += "fishriver"
> > +BBFILE_COLLECTIONS += "fishriver"
> >  BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_fishriver = "6"
> > diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
> > index 564bb1d..8125659 100644
> > --- a/meta-jasperforest/conf/layer.conf
> > +++ b/meta-jasperforest/conf/layer.conf
> > @@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/../common/recipes-*/*/*.bb \
> >  	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
> >  
> > -BBFILE_COLLECTIONS_jasperforest += "jasperforest"
> > +BBFILE_COLLECTIONS += "jasperforest"
> >  BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_jasperforest = "6"
> > diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
> > index e23d123..d5f78e1 100644
> > --- a/meta-sugarbay/conf/layer.conf
> > +++ b/meta-sugarbay/conf/layer.conf
> > @@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> >  	${LAYERDIR}/../common/recipes-*/*/*.bb \
> >  	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
> >  
> > -BBFILE_COLLECTIONS_sugarbay += "sugarbay"
> > +BBFILE_COLLECTIONS += "sugarbay"
> >  BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
> >  BBFILE_PRIORITY_sugarbay = "6"
> 




^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
  2011-05-27 22:01     ` Tom Zanussi
@ 2011-05-27 22:18       ` Jeremy Puhlman
  2011-05-27 22:36         ` Tom Zanussi
  0 siblings, 1 reply; 6+ messages in thread
From: Jeremy Puhlman @ 2011-05-27 22:18 UTC (permalink / raw)
  To: Tom Zanussi; +Cc: yocto, Darren Hart


> The crownbay has two BBFILE_COLLECTIONS in the same file, one for
> crownbay and one for crownbay-noemgd.  The conditional append allows
> them to be selected based on the machine selected.

The BBFILE_COLLECTIONS var basically give you a hook so you can find:

BBFILE_PATTERN_<value set in BBFILE_COLLECTIONS>
BBFILE_PRIORITY_<value set in BBFILE_COLLECTIONS>


While it certainly is true you could have different sets, for different
machines, you set those subsequent values identically. At the moment
there appears to be no need unless your using the value in some other
manner else where. FWIW it probably doesn't matter either way, but it
doesn't appear to be needed by the way you are configuring it.

Jeremy Puhlman
Montavista Sofware, LLC.



^ permalink raw reply	[flat|nested] 6+ messages in thread
* Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides
  2011-05-27 22:18       ` Jeremy Puhlman
@ 2011-05-27 22:36         ` Tom Zanussi
  0 siblings, 0 replies; 6+ messages in thread
From: Tom Zanussi @ 2011-05-27 22:36 UTC (permalink / raw)
  To: Jeremy Puhlman; +Cc: yocto, Darren Hart

On Fri, 2011-05-27 at 15:18 -0700, Jeremy Puhlman wrote:
> > The crownbay has two BBFILE_COLLECTIONS in the same file, one for
> > crownbay and one for crownbay-noemgd.  The conditional append allows
> > them to be selected based on the machine selected.
> 
> The BBFILE_COLLECTIONS var basically give you a hook so you can find:
> 
> BBFILE_PATTERN_<value set in BBFILE_COLLECTIONS>
> BBFILE_PRIORITY_<value set in BBFILE_COLLECTIONS>
> 
> 
> While it certainly is true you could have different sets, for different
> machines, you set those subsequent values identically. At the moment
> there appears to be no need unless your using the value in some other
> manner else where. FWIW it probably doesn't matter either way, but it
> doesn't appear to be needed by the way you are configuring it.
> 

Yeah, you're right - it probably isn't necessary, though not broken
either.

Another thing to put on my list of cleanups for meta-intel that I never
seem to get to...

Thanks for your comments,

Tom

> Jeremy Puhlman
> Montavista Sofware, LLC.
> 




^ permalink raw reply	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-05-27 22:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-05-26 15:40 [PATCH 0/1] meta-intel BBFILE_COLLECTIONS fixups tom.zanussi
2011-05-26 15:40 ` [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides tom.zanussi
2011-05-27 21:55   ` Darren Hart
2011-05-27 22:01     ` Tom Zanussi
2011-05-27 22:18       ` Jeremy Puhlman
2011-05-27 22:36         ` Tom Zanussi

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.