layer.conf: Use .= for adding to BBPATH and += to BBFILES
PATCH 1/1 layer.conf: Use .= for adding to BBPATH and += to BBFILES
From: Andrei Gherzan <[email protected]>
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
--- meta-networking/conf/layer.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta-networking/conf/layer.conf +3 -3
@@ -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}/"
Signature · 1 line
1.8.2
Quoted 25 lines · Christopher Larson
From: Andrei Gherzan <[email protected]>
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 changeSigned-off-by Andrei Gherzan <[email protected]>Signed-off-by Christopher Larson <[email protected]>--- meta-networking/conf/layer.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta-networking/conf/layer.conf +0
-1@@ -1,9 +1,9 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}"
meta-networking/conf/layer.conf line 9
Quoted 10 lines
meta-networking/conf/layer.conf +3
-2+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
Quoted 36 lines · Mark Hatle
Quoted 34 lines · Christopher Larson
From: Andrei Gherzan <[email protected]>
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 changeSigned-off-by Andrei Gherzan <[email protected]>Signed-off-by Christopher Larson <[email protected]>--- meta-networking/conf/layer.**conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta-networking/conf/layer.**conf +3
-3@@ -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"
Quoted 7 lines
meta-networking/conf/layer.**conf line 9
Quoted 4 lines
meta-networking/conf/layer.**conf +0
-0BBFILE_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.
Signature · 1 line
Christopher Larson
Quoted 47 lines · [Re: [oe] [meta-networking][danny][PATCH] layer.conf: Use .= for adding to…
Quoted 36 lines · Mark Hatle
Quoted 34 lines · Christopher Larson
From: Andrei Gherzan <[email protected]>
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 changeSigned-off-by Andrei Gherzan <[email protected]>Signed-off-by Christopher Larson <[email protected]>--- meta-networking/conf/layer.**conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)meta-networking/conf/layer.**conf +3
-3@@ -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"Quoted 7 lines
meta-networking/conf/layer.**conf line 9
Quoted 4 lines
meta-networking/conf/layer.**conf +0
-0BBFILE_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
Quoted 3 lines
Nope, bitbake has handled LAYERDIR specially since Wed Apr 14 14:30:09 2010. See commits
849dbd63244cbc4eaca0f1beedbb67baca024629and40778a6e9e82c7ea4673a74fc19574430fa63e8din bitbake.
Okay, I had a quick look through bitbake to confirm the presence of these on the danny branch, them merged the patch. Thanks.
Signature · 2 lines
-Joe MacDonald. :wq