diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2014-09-26 17:04:57 -0700 |
|---|---|---|
| committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-10-01 14:04:12 -0500 |
| commit | 6702f5a00c414c68f6f6ceae46552bce571cf93f (patch) | |
| tree | 5c161515fe519b086bea13b84d667d05de39ff06 /conf | |
| parent | 9f815ab761e6b524625e4180397233eeb728f84e (diff) | |
| download | meta-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.conf | 2 |
1 files changed, 1 insertions, 1 deletions
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 \ | |||
| 6 | ${LAYERDIR}/common/recipes-*/*/*.bbappend" | 6 | ${LAYERDIR}/common/recipes-*/*/*.bbappend" |
| 7 | 7 | ||
| 8 | BBFILE_COLLECTIONS += "intel" | 8 | BBFILE_COLLECTIONS += "intel" |
| 9 | BBFILE_PATTERN_intel := "^${LAYERDIR}/" | 9 | BBFILE_PATTERN_intel := "^${LAYERDIR}/common/" |
| 10 | BBFILE_PRIORITY_intel = "5" | 10 | BBFILE_PRIORITY_intel = "5" |
| 11 | 11 | ||
| 12 | # Additional license directories. | 12 | # Additional license directories. |