Patchwork [meta-networking,danny] layer.conf: Use .= for adding to BBPATH and += to BBFILES

login
register
mail settings
Submitter Christopher Larson
Date March 21, 2013, 9:46 p.m.
Message ID <1363902391-29945-1-git-send-email-kergoth@gmail.com>
Download mbox | patch
Permalink /patch/46665/
State Accepted, archived
Headers show

Comments

Christopher Larson - March 21, 2013, 9:46 p.m.
From: Andrei Gherzan <andrei.gherzan@windriver.com>

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

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
---
 meta-networking/conf/layer.conf | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Mark Hatle - March 21, 2013, 10:11 p.m.
On 3/21/13 4:46 PM, Christopher Larson wrote:
> From: Andrei Gherzan <andrei.gherzan@windriver.com>
>
> 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
>
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> ---
>   meta-networking/conf/layer.conf | 6 +++---
>   1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
> index f26a172..1ea2bc2 100644
> --- a/meta-networking/conf/layer.conf
> +++ b/meta-networking/conf/layer.conf
> @@ -1,9 +1,9 @@
>   # We have a conf and classes directory, add to BBPATH
> -BBPATH := "${BBPATH}:${LAYERDIR}"
> +BBPATH .= ":${LAYERDIR}"
>
>   # We have a packages directory, add to BBFILES
> -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> - ${LAYERDIR}/recipes-*/*/*.bbappend"
> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> +            ${LAYERDIR}/recipes-*/*/*.bbappend"
>
>   BBFILE_COLLECTIONS += "networking"
>   BBFILE_PATTERN_networking := "^${LAYERDIR}/"
>

Don't those two have to be ":=" so that 'LAYERDIR' is immediately evaluated? 
LAYERDIR changes depending on which layer is currently being processed.

--Mark
Chris Larson - March 21, 2013, 10:22 p.m.
On Thu, Mar 21, 2013 at 3:11 PM, Mark Hatle <mark.hatle@windriver.com>wrote:

> On 3/21/13 4:46 PM, Christopher Larson wrote:
>
>> From: Andrei Gherzan <andrei.gherzan@windriver.com>
>>
>> Fixes parsing errors which is appearing after this commit to
>> meta-openembedded
>>
>> http://cgit.openembedded.org/**meta-openembedded/commit/?id=**
>> 3c21a46020bd0816579648f684c41d**bd6333583e<http://cgit.openembedded.org/meta-openembedded/commit/?id=3c21a46020bd0816579648f684c41dbd6333583e>
>>
>> This triggers
>> exception NameError: name 'base_contains' is not defined
>> without this change
>>
>> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
>> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
>> ---
>>   meta-networking/conf/layer.**conf | 6 +++---
>>   1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta-networking/conf/layer.**conf
>> b/meta-networking/conf/layer.**conf
>> index f26a172..1ea2bc2 100644
>> --- a/meta-networking/conf/layer.**conf
>> +++ b/meta-networking/conf/layer.**conf
>> @@ -1,9 +1,9 @@
>>   # We have a conf and classes directory, add to BBPATH
>> -BBPATH := "${BBPATH}:${LAYERDIR}"
>> +BBPATH .= ":${LAYERDIR}"
>>
>>   # We have a packages directory, add to BBFILES
>> -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
>> - ${LAYERDIR}/recipes-*/*/*.**bbappend"
>> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
>> +            ${LAYERDIR}/recipes-*/*/*.**bbappend"
>>
>>   BBFILE_COLLECTIONS += "networking"
>>   BBFILE_PATTERN_networking := "^${LAYERDIR}/"
>>
>>
> Don't those two have to be ":=" so that 'LAYERDIR' is immediately
> evaluated? LAYERDIR changes depending on which layer is currently being
> processed


Nope, bitbake has handled LAYERDIR specially since Wed Apr 14 14:30:09
2010. See commits 849dbd63244cbc4eaca0f1beedbb67baca024629 and
40778a6e9e82c7ea4673a74fc19574430fa63e8d in bitbake.
Joe MacDonald - March 22, 2013, 3:24 p.m.
[Re: [oe] [meta-networking][danny][PATCH] layer.conf: Use .= for adding to BBPATH and += to BBFILES] On 13.03.21 (Thu 15:22) Chris Larson wrote:

> On Thu, Mar 21, 2013 at 3:11 PM, Mark Hatle <mark.hatle@windriver.com>wrote:
> 
> > On 3/21/13 4:46 PM, Christopher Larson wrote:
> >
> >> From: Andrei Gherzan <andrei.gherzan@windriver.com>
> >>
> >> Fixes parsing errors which is appearing after this commit to
> >> meta-openembedded
> >>
> >> http://cgit.openembedded.org/**meta-openembedded/commit/?id=**
> >> 3c21a46020bd0816579648f684c41d**bd6333583e<http://cgit.openembedded.org/meta-openembedded/commit/?id=3c21a46020bd0816579648f684c41dbd6333583e>
> >>
> >> This triggers
> >> exception NameError: name 'base_contains' is not defined
> >> without this change
> >>
> >> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>
> >> Signed-off-by: Christopher Larson <chris_larson@mentor.com>
> >> ---
> >>   meta-networking/conf/layer.**conf | 6 +++---
> >>   1 file changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/meta-networking/conf/layer.**conf
> >> b/meta-networking/conf/layer.**conf
> >> index f26a172..1ea2bc2 100644
> >> --- a/meta-networking/conf/layer.**conf
> >> +++ b/meta-networking/conf/layer.**conf
> >> @@ -1,9 +1,9 @@
> >>   # We have a conf and classes directory, add to BBPATH
> >> -BBPATH := "${BBPATH}:${LAYERDIR}"
> >> +BBPATH .= ":${LAYERDIR}"
> >>
> >>   # We have a packages directory, add to BBFILES
> >> -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
> >> - ${LAYERDIR}/recipes-*/*/*.**bbappend"
> >> +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
> >> +            ${LAYERDIR}/recipes-*/*/*.**bbappend"
> >>
> >>   BBFILE_COLLECTIONS += "networking"
> >>   BBFILE_PATTERN_networking := "^${LAYERDIR}/"
> >>
> >>
> > Don't those two have to be ":=" so that 'LAYERDIR' is immediately
> > evaluated? LAYERDIR changes depending on which layer is currently being
> > processed
> 
> 
> Nope, bitbake has handled LAYERDIR specially since Wed Apr 14 14:30:09
> 2010. See commits 849dbd63244cbc4eaca0f1beedbb67baca024629 and
> 40778a6e9e82c7ea4673a74fc19574430fa63e8d in bitbake.

Okay, I had a quick look through bitbake to confirm the presence of
these on the danny branch, them merged the patch.  Thanks.

Patch

diff --git a/meta-networking/conf/layer.conf b/meta-networking/conf/layer.conf
index f26a172..1ea2bc2 100644
--- a/meta-networking/conf/layer.conf
+++ b/meta-networking/conf/layer.conf
@@ -1,9 +1,9 @@ 
 # We have a conf and classes directory, add to BBPATH
-BBPATH := "${BBPATH}:${LAYERDIR}"
+BBPATH .= ":${LAYERDIR}"
 
 # We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
- ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
+            ${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "networking"
 BBFILE_PATTERN_networking := "^${LAYERDIR}/"