diff options
author | Khem Raj <raj.khem@gmail.com> | 2013-01-03 19:50:30 -0800 |
---|---|---|
committer | Darren Hart <dvhart@linux.intel.com> | 2013-01-07 09:59:05 -0800 |
commit | 227d8fa72c2ffbccee4c21ffb32841129a550729 (patch) | |
tree | 85df90d009973dd865363d1bf187d176de2a44ac | |
parent | 14b4fb07d3d51208f138fe87121d078cd8fb9ab2 (diff) | |
download | meta-intel-227d8fa72c2ffbccee4c21ffb32841129a550729.tar.gz |
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
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.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-rw-r--r-- | conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-cedartrail/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-chiefriver/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-crownbay/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-crystalforest/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-emenlow/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-fri2/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-jasperforest/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-n450/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-nuc/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-romley/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-sugarbay/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-sys940x/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-tlk/conf/layer.conf | 4 |
14 files changed, 28 insertions, 28 deletions
diff --git a/conf/layer.conf b/conf/layer.conf index e9c2b10a..31132ab0 100644 --- a/conf/layer.conf +++ b/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have recipes-* directories, add to BBFILES | 4 | # We have recipes-* directories, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/common/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/common/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/common/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "intel" | 8 | BBFILE_COLLECTIONS += "intel" |
diff --git a/meta-cedartrail/conf/layer.conf b/meta-cedartrail/conf/layer.conf index c19c4c10..0166b35c 100644 --- a/meta-cedartrail/conf/layer.conf +++ b/meta-cedartrail/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "cedartrail" | 8 | BBFILE_COLLECTIONS += "cedartrail" |
diff --git a/meta-chiefriver/conf/layer.conf b/meta-chiefriver/conf/layer.conf index 5dc3c021..6164f995 100644 --- a/meta-chiefriver/conf/layer.conf +++ b/meta-chiefriver/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "chiefriver" | 8 | BBFILE_COLLECTIONS += "chiefriver" |
diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf index cb17298f..e6cc2a02 100644 --- a/meta-crownbay/conf/layer.conf +++ b/meta-crownbay/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "crownbay" | 8 | BBFILE_COLLECTIONS += "crownbay" |
diff --git a/meta-crystalforest/conf/layer.conf b/meta-crystalforest/conf/layer.conf index 6b802d63..daa2ba7c 100644 --- a/meta-crystalforest/conf/layer.conf +++ b/meta-crystalforest/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "crystalforest" | 8 | BBFILE_COLLECTIONS += "crystalforest" |
diff --git a/meta-emenlow/conf/layer.conf b/meta-emenlow/conf/layer.conf index a49ec47f..b5832e4f 100644 --- a/meta-emenlow/conf/layer.conf +++ b/meta-emenlow/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have recipes-* directories, add to BBFILES | 4 | # We have recipes-* directories, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "emenlow" | 8 | BBFILE_COLLECTIONS += "emenlow" |
diff --git a/meta-fri2/conf/layer.conf b/meta-fri2/conf/layer.conf index 4d140f96..0bb29a13 100644 --- a/meta-fri2/conf/layer.conf +++ b/meta-fri2/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "fri2" | 8 | BBFILE_COLLECTIONS += "fri2" |
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf index 09f1647a..b539733c 100644 --- a/meta-jasperforest/conf/layer.conf +++ b/meta-jasperforest/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES .= "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "jasperforest" | 8 | BBFILE_COLLECTIONS += "jasperforest" |
diff --git a/meta-n450/conf/layer.conf b/meta-n450/conf/layer.conf index 4481121f..ee53e543 100644 --- a/meta-n450/conf/layer.conf +++ b/meta-n450/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have recipes-* directories, add to BBFILES | 4 | # We have recipes-* directories, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "n450" | 8 | BBFILE_COLLECTIONS += "n450" |
diff --git a/meta-nuc/conf/layer.conf b/meta-nuc/conf/layer.conf index fb5b58a0..174411ff 100644 --- a/meta-nuc/conf/layer.conf +++ b/meta-nuc/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "nuc" | 8 | BBFILE_COLLECTIONS += "nuc" |
diff --git a/meta-romley/conf/layer.conf b/meta-romley/conf/layer.conf index 8ce1a4db..7b6a5bc3 100644 --- a/meta-romley/conf/layer.conf +++ b/meta-romley/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "romley" | 8 | BBFILE_COLLECTIONS += "romley" |
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf index eb8ec45e..9576330b 100644 --- a/meta-sugarbay/conf/layer.conf +++ b/meta-sugarbay/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "sugarbay" | 8 | BBFILE_COLLECTIONS += "sugarbay" |
diff --git a/meta-sys940x/conf/layer.conf b/meta-sys940x/conf/layer.conf index 5d588ade..b14be6db 100644 --- a/meta-sys940x/conf/layer.conf +++ b/meta-sys940x/conf/layer.conf | |||
@@ -1,8 +1,8 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have a recipes directory, add to BBFILES | 4 | # We have a recipes directory, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS += "sys940x" | 8 | BBFILE_COLLECTIONS += "sys940x" |
diff --git a/meta-tlk/conf/layer.conf b/meta-tlk/conf/layer.conf index fc0da613..38b0e0c2 100644 --- a/meta-tlk/conf/layer.conf +++ b/meta-tlk/conf/layer.conf | |||
@@ -1,6 +1,6 @@ | |||
1 | # We have a conf and classes directory, add to BBPATH | 1 | # We have a conf and classes directory, add to BBPATH |
2 | BBPATH := "${BBPATH}:${LAYERDIR}" | 2 | BBPATH .= ":${LAYERDIR}" |
3 | 3 | ||
4 | # We have recipes-* directories, add to BBFILES | 4 | # We have recipes-* directories, add to BBFILES |
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |