aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-05-26 00:37:12 -0500
committerTom Zanussi <tom.zanussi@intel.com>2011-05-26 09:22:59 -0500
commitf113449eb132df7c8a4c45ad8719ecc3ec84a6b5 (patch)
tree58486c2575de362ed5e80df8dfcc1babeb834caf
parent1b227f8ed2df529cc13f7169b0c08ff3d0f8c812 (diff)
downloadmeta-intel-f113449eb132df7c8a4c45ad8719ecc3ec84a6b5.tar.gz
meta-intel-f113449eb132df7c8a4c45ad8719ecc3ec84a6b5.tar.bz2
meta-intel-f113449eb132df7c8a4c45ad8719ecc3ec84a6b5.zip
meta-intel: fix BBFILE_COLLECTIONS overrides
Several BBFILE_COLLECTIONS assignments in the layer.confs for these meta-intel layers added unwanted machine overrides, resulting in truncated values for this variable - remove them. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-crownbay/conf/layer.conf4
-rw-r--r--meta-fishriver/conf/layer.conf2
-rw-r--r--meta-jasperforest/conf/layer.conf2
-rw-r--r--meta-sugarbay/conf/layer.conf2
4 files changed, 5 insertions, 5 deletions
diff --git a/meta-crownbay/conf/layer.conf b/meta-crownbay/conf/layer.conf
index cee4ba24..d15579d4 100644
--- a/meta-crownbay/conf/layer.conf
+++ b/meta-crownbay/conf/layer.conf
@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS_crownbay += "crownbay"
+BBFILE_COLLECTIONS_append_crownbay += "crownbay"
BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
BBFILE_PRIORITY_crownbay = "6"
-BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd"
+BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
BBFILE_PRIORITY_crownbay-noemgd = "6"
diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
index 595bbe32..9162b5ef 100644
--- a/meta-fishriver/conf/layer.conf
+++ b/meta-fishriver/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS_fishriver += "fishriver"
+BBFILE_COLLECTIONS += "fishriver"
BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
BBFILE_PRIORITY_fishriver = "6"
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
index 564bb1d8..81256596 100644
--- a/meta-jasperforest/conf/layer.conf
+++ b/meta-jasperforest/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS_jasperforest += "jasperforest"
+BBFILE_COLLECTIONS += "jasperforest"
BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
BBFILE_PRIORITY_jasperforest = "6"
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
index e23d1233..d5f78e1c 100644
--- a/meta-sugarbay/conf/layer.conf
+++ b/meta-sugarbay/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bb \
${LAYERDIR}/../common/recipes-*/*/*.bbappend"
-BBFILE_COLLECTIONS_sugarbay += "sugarbay"
+BBFILE_COLLECTIONS += "sugarbay"
BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
BBFILE_PRIORITY_sugarbay = "6"