summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2014-09-27 00:04:57 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2014-10-01 19:04:12 (GMT)
commit6702f5a00c414c68f6f6ceae46552bce571cf93f (patch)
tree5c161515fe519b086bea13b84d667d05de39ff06 /conf
parent9f815ab761e6b524625e4180397233eeb728f84e (diff)
downloadmeta-intel-6702f5a00c414c68f6f6ceae46552bce571cf93f.tar.gz
layer.conf: Avoid conflicts with sub-layers
The layer priority is getting ignored because the same set of files are visible in the meta-intel layer as well as any of its sub layers. The layer pattern for recipe files is changed from "^${LAYERDIR}/" to "^${LAYERDIR}/common" to stop unintentionally including the sub-layer recipe files in the meta-intel layer. Fixes Bug: [YOCTO #6552] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/layer.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index eb5e8da..3b7de9a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \
6 ${LAYERDIR}/common/recipes-*/*/*.bbappend" 6 ${LAYERDIR}/common/recipes-*/*/*.bbappend"
7 7
8BBFILE_COLLECTIONS += "intel" 8BBFILE_COLLECTIONS += "intel"
9BBFILE_PATTERN_intel := "^${LAYERDIR}/" 9BBFILE_PATTERN_intel := "^${LAYERDIR}/common/"
10BBFILE_PRIORITY_intel = "5" 10BBFILE_PRIORITY_intel = "5"
11 11
12# Additional license directories. 12# Additional license directories.