From 6702f5a00c414c68f6f6ceae46552bce571cf93f Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Fri, 26 Sep 2014 17:04:57 -0700 Subject: 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 Signed-off-by: Tom Zanussi --- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/layer.conf b/conf/layer.conf index eb5e8da5..3b7de9aa 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -6,7 +6,7 @@ BBFILES += "${LAYERDIR}/common/recipes-*/*/*.bb \ ${LAYERDIR}/common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel" -BBFILE_PATTERN_intel := "^${LAYERDIR}/" +BBFILE_PATTERN_intel := "^${LAYERDIR}/common/" BBFILE_PRIORITY_intel = "5" # Additional license directories. -- cgit v1.2.3-54-g00ecf