layer.conf: Use .= for adding to BBPATH and += to BBFILES
PATCH 1/1 layer.conf: Use .= for adding to BBPATH and += to BBFILES
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
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)
conf/layer.conf +2 -2
@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"
meta-cedartrail/conf/layer.conf +2 -2
@@ -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 += "cedartrail"
meta-chiefriver/conf/layer.conf +2 -2
@@ -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 += "chiefriver"
meta-crownbay/conf/layer.conf +2 -2
@@ -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 += "crownbay"
meta-crystalforest/conf/layer.conf +2 -2
@@ -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 += "crystalforest"
meta-emenlow/conf/layer.conf +2 -2
@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"
meta-fri2/conf/layer.conf +2 -2
@@ -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 += "fri2"
meta-jasperforest/conf/layer.conf +2 -2
@@ -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 += "jasperforest"
meta-n450/conf/layer.conf +2 -2
@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"
meta-nuc/conf/layer.conf +2 -2
@@ -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 += "nuc"
meta-romley/conf/layer.conf +2 -2
@@ -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 += "romley"
meta-sugarbay/conf/layer.conf +2 -2
@@ -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 += "sugarbay"
meta-sys940x/conf/layer.conf +2 -2
@@ -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 += "sys940x"
meta-tlk/conf/layer.conf +2 -2
@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"
Signature · 1 line
1.7.9.5
Hi Khem,
Quoted 8 lines · Khem Raj
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
OK, so your solution is to avoid the immediate expansion operator (:=) which caused base_contains added in the previous commit to fail to expand at the time the meta-intel layer configs are parsed and replace it with one of the append operators (.= or +=) that allows for delayed variable expansion. This seems correct to me - but please include this explanation in your commit message in the future.
Also, please use the meta-intel mailing list for changes to meta-intel (Cc'd now).
https://lists.yoctoproject.org/listinfo/meta-intel
Tom, any objection?
Quoted 2 lines
Signed-off-by Khem Raj <[email protected]>
Quoted 226 lines
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"meta-cedartrail/conf/layer.conf +2
-2@@ -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 += "cedartrail"meta-chiefriver/conf/layer.conf +2
-2@@ -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 += "chiefriver"meta-crownbay/conf/layer.conf +2
-2@@ -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 += "crownbay"meta-crystalforest/conf/layer.conf +2
-2@@ -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 += "crystalforest"meta-emenlow/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"meta-fri2/conf/layer.conf +2
-2@@ -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 += "fri2"meta-jasperforest/conf/layer.conf +2
-2@@ -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 += "jasperforest"meta-n450/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"meta-nuc/conf/layer.conf +2
-2@@ -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 += "nuc"meta-romley/conf/layer.conf +2
-2@@ -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 += "romley"meta-sugarbay/conf/layer.conf +2
-2@@ -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 += "sugarbay"meta-sys940x/conf/layer.conf +2
-2@@ -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 += "sys940x"meta-tlk/conf/layer.conf +2
-2@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel
Quoted 12 lines · Darren Hart
Hi Khem,
Quoted 8 lines · Khem Raj
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
Quoted 7 lines
OK, so your solution is to avoid the immediate expansion operator (:=) which caused
base_containsadded in the previous commit to fail to expand at the time the meta-intel layer configs are parsed and replace it with one of the append operators (.= or +=) that allows for delayed variable expansion. This seems correct to me - but please include this explanation in your commit message in the future.
.= and += are explained in bb manual very well :)
Quoted 2 lines
Also, please use the meta-intel mailing list for changes to meta-intel (Cc'd now).
oh ok. I did not know if such a ml existed.
Quoted 243 lines
https://lists.yoctoproject.org/listinfo/meta-intel
Tom, any objection?
Quoted 2 lines
Signed-off-by Khem Raj <[email protected]>Acked-by Darren Hart <[email protected]>Quoted 218 lines
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"meta-cedartrail/conf/layer.conf +2
-2@@ -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 += "cedartrail"meta-chiefriver/conf/layer.conf +2
-2@@ -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 += "chiefriver"meta-crownbay/conf/layer.conf +2
-2@@ -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 += "crownbay"meta-crystalforest/conf/layer.conf +2
-2@@ -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 += "crystalforest"meta-emenlow/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"meta-fri2/conf/layer.conf +2
-2@@ -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 += "fri2"meta-jasperforest/conf/layer.conf +2
-2@@ -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 += "jasperforest"meta-n450/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"meta-nuc/conf/layer.conf +2
-2@@ -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 += "nuc"meta-romley/conf/layer.conf +2
-2@@ -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 += "romley"meta-sugarbay/conf/layer.conf +2
-2@@ -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 += "sugarbay"meta-sys940x/conf/layer.conf +2
-2@@ -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 += "sys940x"meta-tlk/conf/layer.conf +0
-0meta-tlk/conf/layer.conf line 6
Quoted 8 lines
meta-tlk/conf/layer.conf +2
-2@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
Quoted 21 lines · Khem Raj
Quoted 12 lines · Darren Hart
Hi Khem,
Quoted 8 lines · Khem Raj
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 changeQuoted 7 lines
OK, so your solution is to avoid the immediate expansion operator (:=) which caused
base_containsadded in the previous commit to fail to expand at the time the meta-intel layer configs are parsed and replace it with one of the append operators (.= or +=) that allows for delayed variable expansion. This seems correct to me - but please include this explanation in your commit message in the future.
Quoted 7 lines
.= and += are explained in bb manual very well :)
Quoted 2 lines
Also, please use the meta-intel mailing list for changes to meta-intel (Cc'd now).
oh ok. I did not know if such a ml existed.
Indeed they are - and I referred to it to make sure I understood your patch. :-)
A good commit message should describe the intended approach so it can be well understood without the manual. That allows the intent to be verified with the manual rather than derived from the manual.
--
Darren
Quoted 243 lines
Quoted 243 lines
https://lists.yoctoproject.org/listinfo/meta-intel
Tom, any objection?
Quoted 2 lines
Signed-off-by Khem Raj <[email protected]>Acked-by Darren Hart <[email protected]>Quoted 218 lines
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"meta-cedartrail/conf/layer.conf +2
-2@@ -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 += "cedartrail"meta-chiefriver/conf/layer.conf +2
-2@@ -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 += "chiefriver"meta-crownbay/conf/layer.conf +2
-2@@ -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 += "crownbay"meta-crystalforest/conf/layer.conf +2
-2@@ -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 += "crystalforest"meta-emenlow/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"meta-fri2/conf/layer.conf +2
-2@@ -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 += "fri2"meta-jasperforest/conf/layer.conf +2
-2@@ -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 += "jasperforest"meta-n450/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"meta-nuc/conf/layer.conf +2
-2@@ -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 += "nuc"meta-romley/conf/layer.conf +2
-2@@ -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 += "romley"meta-sugarbay/conf/layer.conf +2
-2@@ -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 += "sugarbay"meta-sys940x/conf/layer.conf +2
-2@@ -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 += "sys940x"meta-tlk/conf/layer.conf +0
-0meta-tlk/conf/layer.conf line 6
Quoted 8 lines
meta-tlk/conf/layer.conf +2
-2@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"--
Darren Hart
Intel Open Source Technology Center
Yocto Project - Technical Lead - Linux Kernel
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel
Tom Zanussi
Acked-byQuoted 19 lines · Darren Hart
Hi Khem,
Quoted 8 lines · Khem Raj
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 changeOK, so your solution is to avoid the immediate expansion operator (:=) which caused
base_containsadded in the previous commit to fail to expand at the time the meta-intel layer configs are parsed and replace it with one of the append operators (.= or +=) that allows for delayed variable expansion. This seems correct to me - but please include this explanation in your commit message in the future.
Quoted 6 lines
Also, please use the meta-intel mailing list for changes to meta-intel (Cc'd now).
https://lists.yoctoproject.org/listinfo/meta-intelTom, any objection?
No, the changes look fine to me.
Quoted 235 lines
Quoted 3 lines
Signed-off-by Khem Raj <[email protected]>Acked-by Darren Hart <[email protected]>Quoted 226 lines
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"meta-cedartrail/conf/layer.conf +2
-2@@ -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 += "cedartrail"meta-chiefriver/conf/layer.conf +2
-2@@ -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 += "chiefriver"meta-crownbay/conf/layer.conf +2
-2@@ -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 += "crownbay"meta-crystalforest/conf/layer.conf +2
-2@@ -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 += "crystalforest"meta-emenlow/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"meta-fri2/conf/layer.conf +2
-2@@ -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 += "fri2"meta-jasperforest/conf/layer.conf +2
-2@@ -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 += "jasperforest"meta-n450/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"meta-nuc/conf/layer.conf +2
-2@@ -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 += "nuc"meta-romley/conf/layer.conf +2
-2@@ -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 += "romley"meta-sugarbay/conf/layer.conf +2
-2@@ -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 += "sugarbay"meta-sys940x/conf/layer.conf +2
-2@@ -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 += "sys940x"meta-tlk/conf/layer.conf +2
-2@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"
Darren Hart
AppliedQuoted 10 lines · Khem Raj
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 Khem Raj <[email protected]>
Merged to meta-intel/master.
Thanks,
Darren
Quoted 226 lines
--- conf/layer.conf | 4 ++-- meta-cedartrail/conf/layer.conf | 4 ++-- meta-chiefriver/conf/layer.conf | 4 ++-- meta-crownbay/conf/layer.conf | 4 ++-- meta-crystalforest/conf/layer.conf | 4 ++-- meta-emenlow/conf/layer.conf | 4 ++-- meta-fri2/conf/layer.conf | 4 ++-- meta-jasperforest/conf/layer.conf | 4 ++-- meta-n450/conf/layer.conf | 4 ++-- meta-nuc/conf/layer.conf | 4 ++-- meta-romley/conf/layer.conf | 4 ++-- meta-sugarbay/conf/layer.conf | 4 ++-- meta-sys940x/conf/layer.conf | 4 ++-- meta-tlk/conf/layer.conf | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-)conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel"meta-cedartrail/conf/layer.conf +2
-2@@ -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 += "cedartrail"meta-chiefriver/conf/layer.conf +2
-2@@ -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 += "chiefriver"meta-crownbay/conf/layer.conf +2
-2@@ -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 += "crownbay"meta-crystalforest/conf/layer.conf +2
-2@@ -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 += "crystalforest"meta-emenlow/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "emenlow"meta-fri2/conf/layer.conf +2
-2@@ -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 += "fri2"meta-jasperforest/conf/layer.conf +2
-2@@ -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 += "jasperforest"meta-n450/conf/layer.conf +2
-2@@ -1,8 +1,8 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "n450"meta-nuc/conf/layer.conf +2
-2@@ -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 += "nuc"meta-romley/conf/layer.conf +2
-2@@ -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 += "romley"meta-sugarbay/conf/layer.conf +2
-2@@ -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 += "sugarbay"meta-sys940x/conf/layer.conf +2
-2@@ -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 += "sys940x"meta-tlk/conf/layer.conf +2
-2@@ -1,6 +1,6 @@ # We have a conf and classes directory, add to BBPATH -BBPATH := "${BBPATH}:${LAYERDIR}" +BBPATH .= ":${LAYERDIR}" # We have recipes-* directories, add to BBFILES -BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ +BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend"
Signature · 3 lines
Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel