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

login
register
mail settings
Submitter Andrei Gherzan
Date Jan. 4, 2013, 11:33 a.m.
Message ID <1357299205-21120-1-git-send-email-andrei.gherzan@windriver.com>
Download mbox | patch
Permalink /patch/41983/
State Accepted
Commit cd5f284730a6430d563443786c409aa6783d4b04
Headers show

Comments

Andrei Gherzan - Jan. 4, 2013, 11:33 a.m.
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>
---
 meta-networking/conf/layer.conf |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Joe MacDonald - Jan. 4, 2013, 8:16 p.m.
Merged, thanks.
-J.

[[oe] [meta-networking][PATCH] layer.conf: Use .= for adding to BBPATH and += to BBFILES] On 13.01.04 (Fri 13:33) Andrei Gherzan 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
> 
> Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.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}/"

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}/"