| Message ID | 1517320348-58881-1-git-send-email-noor_ahsan@mentor.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-swupdate] layer.conf: do not force early expansion of BBFILES | expand |
Hi Ahsan, On 30/01/2018 14:52, Noor, Ahsan wrote: > From: Cedric Hombourger <Cedric_Hombourger@mentor.com> > > The BBFILES expression is forcing an early expansion which > results in the BBFILE_COLLECTIONS references in BBFILES being > expanded before all the layers were added to it. > > Signed-off-by: Chris Larson <Chris_Larson@mentor.com> > Tested-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> > Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> > --- > conf/layer.conf | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/conf/layer.conf b/conf/layer.conf > index 1854c91..0ad6e3b 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 a recipes directory, add to BBFILES > -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ > +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ > ${LAYERDIR}/recipes-*/*/*.bbappend" > > BBFILE_COLLECTIONS += "swupdate" > Thanks. Question is which branches should be fixed. I would propose I merge into -pyro, -rocko and -master. Best regards, Stefano Babic
>-----Original Message----- >From: Stefano Babic [mailto:sbabic@denx.de] >Sent: Tuesday, January 30, 2018 7:22 PM >To: Ahsan, Noor <Noor_Ahsan@mentor.com>; swupdate@googlegroups.com >Cc: Hombourger, Cedric <Cedric_Hombourger@mentor.com>; Larson, Chris <Chris_Larson@mentor.com> >Subject: Re: [swupdate] [meta-swupdate][PATCH] layer.conf: do not force early expansion of BBFILES > >Hi Ahsan, > >On 30/01/2018 14:52, Noor, Ahsan wrote: >> From: Cedric Hombourger <Cedric_Hombourger@mentor.com> >> >> The BBFILES expression is forcing an early expansion which results in >> the BBFILE_COLLECTIONS references in BBFILES being expanded before all >> the layers were added to it. >> >> Signed-off-by: Chris Larson <Chris_Larson@mentor.com> >> Tested-by: Cedric Hombourger <Cedric_Hombourger@mentor.com> >> Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> >> --- >> conf/layer.conf | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/conf/layer.conf b/conf/layer.conf index 1854c91..0ad6e3b >> 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 a recipes directory, add to BBFILES -BBFILES := "${BBFILES} >> ${LAYERDIR}/recipes-*/*/*.bb \ >> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ >> ${LAYERDIR}/recipes-*/*/*.bbappend" >> >> BBFILE_COLLECTIONS += "swupdate" >> > > >Thanks. Question is which branches should be fixed. I would propose I merge into -pyro, -rocko and -master. > I agree. > >Best regards, >Stefano Babic > >-- >===================================================================== >DENX Software Engineering GmbH, Managing Director: Wolfgang Denk >HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany >Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic@denx.de >=====================================================================
diff --git a/conf/layer.conf b/conf/layer.conf index 1854c91..0ad6e3b 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 a recipes directory, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "swupdate"