diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2011-05-26 00:37:12 -0500 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@intel.com> | 2011-05-26 09:22:59 -0500 |
commit | f113449eb132df7c8a4c45ad8719ecc3ec84a6b5 (patch) | |
tree | 58486c2575de362ed5e80df8dfcc1babeb834caf | |
parent | 1b227f8ed2df529cc13f7169b0c08ff3d0f8c812 (diff) | |
download | meta-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.conf | 4 | ||||
-rw-r--r-- | meta-fishriver/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-jasperforest/conf/layer.conf | 2 | ||||
-rw-r--r-- | meta-sugarbay/conf/layer.conf | 2 |
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}" | |||
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS_crownbay += "crownbay" | 8 | BBFILE_COLLECTIONS_append_crownbay += "crownbay" |
9 | BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_crownbay := "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_crownbay = "6" | 10 | BBFILE_PRIORITY_crownbay = "6" |
11 | 11 | ||
12 | BBFILE_COLLECTIONS_crownbay-noemgd += "crownbay-noemgd" | 12 | BBFILE_COLLECTIONS_append_crownbay-noemgd += "crownbay-noemgd" |
13 | BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" | 13 | BBFILE_PATTERN_crownbay-noemgd := "^${LAYERDIR}/" |
14 | BBFILE_PRIORITY_crownbay-noemgd = "6" | 14 | 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}" | |||
5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ | 5 | BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \ |
6 | ${LAYERDIR}/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/recipes-*/*/*.bbappend" |
7 | 7 | ||
8 | BBFILE_COLLECTIONS_fishriver += "fishriver" | 8 | BBFILE_COLLECTIONS += "fishriver" |
9 | BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_fishriver := "^${LAYERDIR}/" |
10 | BBFILE_PRIORITY_fishriver = "6" | 10 | 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 \ | |||
7 | ${LAYERDIR}/../common/recipes-*/*/*.bb \ | 7 | ${LAYERDIR}/../common/recipes-*/*/*.bb \ |
8 | ${LAYERDIR}/../common/recipes-*/*/*.bbappend" | 8 | ${LAYERDIR}/../common/recipes-*/*/*.bbappend" |
9 | 9 | ||
10 | BBFILE_COLLECTIONS_jasperforest += "jasperforest" | 10 | BBFILE_COLLECTIONS += "jasperforest" |
11 | BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" | 11 | BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/" |
12 | BBFILE_PRIORITY_jasperforest = "6" | 12 | 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 \ | |||
7 | ${LAYERDIR}/../common/recipes-*/*/*.bb \ | 7 | ${LAYERDIR}/../common/recipes-*/*/*.bb \ |
8 | ${LAYERDIR}/../common/recipes-*/*/*.bbappend" | 8 | ${LAYERDIR}/../common/recipes-*/*/*.bbappend" |
9 | 9 | ||
10 | BBFILE_COLLECTIONS_sugarbay += "sugarbay" | 10 | BBFILE_COLLECTIONS += "sugarbay" |
11 | BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" | 11 | BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/" |
12 | BBFILE_PRIORITY_sugarbay = "6" | 12 | BBFILE_PRIORITY_sugarbay = "6" |