From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mx1.pokylinux.org (Postfix) with ESMTP id 7538F4C80889 for ; Fri, 27 May 2011 17:02:13 -0500 (CDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 27 May 2011 15:02:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,282,1304319600"; d="scan'208";a="8767896" Received: from unknown (HELO [10.255.12.115]) ([10.255.12.115]) by fmsmga002.fm.intel.com with ESMTP; 27 May 2011 15:02:12 -0700 From: Tom Zanussi To: Darren Hart In-Reply-To: <4DE01DD3.80506@linux.intel.com> References: <4DE01DD3.80506@linux.intel.com> Date: Fri, 27 May 2011 17:01:22 -0500 Message-ID: <1306533682.23639.18.camel@elmorro> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: "yocto@yoctoproject.org" Subject: Re: [PATCH 1/1] meta-intel: fix BBFILE_COLLECTIONS overrides X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 22:02:13 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit 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 > > > > 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 > > --- > > 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" >