summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-05-26 05:37:12 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-05-26 14:22:59 (GMT)
commitf113449eb132df7c8a4c45ad8719ecc3ec84a6b5 (patch)
tree58486c2575de362ed5e80df8dfcc1babeb834caf
parent1b227f8ed2df529cc13f7169b0c08ff3d0f8c812 (diff)
downloadmeta-intel-f113449eb132df7c8a4c45ad8719ecc3ec84a6b5.tar.gz
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 cee4ba2..d15579d 100644
--- a/meta-crownbay/conf/layer.conf
+++ b/meta-crownbay/conf/layer.conf
@@ -5,10 +5,10 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
5BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ 5BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend" 6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7 7
8BBFILE_COLLECTIONS_crownbay += "crownbay" 8BBFILE_COLLECTIONS_append_crownbay += "crownbay"
9BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" 9BBFILE_PATTERN_crownbay := "^${LAYERDIR}/"
10BBFILE_PRIORITY_crownbay = "6" 10BBFILE_PRIORITY_crownbay = "6"
11 11
12BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd" 12BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd"
13BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" 13BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/"
14BBFILE_PRIORITY_crownbay-noemgd = "6" 14BBFILE_PRIORITY_crownbay-noemgd = "6"
diff --git a/meta-fishriver/conf/layer.conf b/meta-fishriver/conf/layer.conf
index 595bbe3..9162b5e 100644
--- a/meta-fishriver/conf/layer.conf
+++ b/meta-fishriver/conf/layer.conf
@@ -5,6 +5,6 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
5BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ 5BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
6 ${LAYERDIR}/recipes-*/*/*.bbappend" 6 ${LAYERDIR}/recipes-*/*/*.bbappend"
7 7
8BBFILE_COLLECTIONS_fishriver += "fishriver" 8BBFILE_COLLECTIONS += "fishriver"
9BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" 9BBFILE_PATTERN_fishriver := "^${LAYERDIR}/"
10BBFILE_PRIORITY_fishriver = "6" 10BBFILE_PRIORITY_fishriver = "6"
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
index 564bb1d..8125659 100644
--- a/meta-jasperforest/conf/layer.conf
+++ b/meta-jasperforest/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
7 ${LAYERDIR}/../common/recipes-*/*/*.bb \ 7 ${LAYERDIR}/../common/recipes-*/*/*.bb \
8 ${LAYERDIR}/../common/recipes-*/*/*.bbappend" 8 ${LAYERDIR}/../common/recipes-*/*/*.bbappend"
9 9
10BBFILE_COLLECTIONS_jasperforest += "jasperforest" 10BBFILE_COLLECTIONS += "jasperforest"
11BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" 11BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
12BBFILE_PRIORITY_jasperforest = "6" 12BBFILE_PRIORITY_jasperforest = "6"
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
index e23d123..d5f78e1 100644
--- a/meta-sugarbay/conf/layer.conf
+++ b/meta-sugarbay/conf/layer.conf
@@ -7,6 +7,6 @@ BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
7 ${LAYERDIR}/../common/recipes-*/*/*.bb \ 7 ${LAYERDIR}/../common/recipes-*/*/*.bb \
8 ${LAYERDIR}/../common/recipes-*/*/*.bbappend" 8 ${LAYERDIR}/../common/recipes-*/*/*.bbappend"
9 9
10BBFILE_COLLECTIONS_sugarbay += "sugarbay" 10BBFILE_COLLECTIONS += "sugarbay"
11BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" 11BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
12BBFILE_PRIORITY_sugarbay = "6" 12BBFILE_PRIORITY_sugarbay = "6"