From 1f25c977abf3ec6a6aa790db438d148472e39882 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Tue, 10 Dec 2019 10:36:54 -0800 Subject: meta-intel: Fix layer priority After adding the rsyslog bbappend some changes were not applied because the meta-phosphor layer also has an rsyslog bbappend at a higher priority. This change makes meta-intel depend on meta-phosphor so that recipes here are treated with a higher priority. Tested: rsyslog.conf override from meta-intel is applied. (From meta-intel rev: 89efcbb081b11050f8532addd4521e17afede3d6) Change-Id: I6e40e12129118743ad019ff126bcb6c40960cb7c Signed-off-by: Jason M. Bills Signed-off-by: Brad Bishop --- meta-intel/conf/layer.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-intel/conf/layer.conf b/meta-intel/conf/layer.conf index b43594da5..c753477a8 100644 --- a/meta-intel/conf/layer.conf +++ b/meta-intel/conf/layer.conf @@ -6,6 +6,7 @@ BBFILES += "${LAYERDIR}/meta-common/recipes-*/*/*.bb \ ${LAYERDIR}/meta-common/recipes-*/*/*.bbappend" BBFILE_COLLECTIONS += "intel" -BBFILE_PATTERN_intel = "" +BBFILE_PATTERN_intel = "^${LAYERDIR}/" LAYERVERSION_intel = "1" LAYERSERIES_COMPAT_intel = "warrior zeus" +LAYERDEPENDS_intel = "phosphor-layer" -- cgit v1.2.3