[meta-mentor] [PATCH 3/3] layer.conf: support per-layer bbappends

[Michael Brown]

From: Christopher Larson <chris_larson at mentor.com>

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
(cherry picked from commit 2d26db9bba123d380457fd8ab9b0d8fdb6619552)

Signed-off-by: Michael Brown <mw_brown at mentor.com>
---
 conf/layer.conf |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/layer.conf b/conf/layer.conf
index 4075d44..5a37072 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -1,8 +1,12 @@
 BBPATH .= ":${LAYERDIR}"
 BBFILES += "${LAYERDIR}/recipes/*/*.bb \
             ${LAYERDIR}/recipes/*/*.bbappend"
+
+# Let us add layer-specific bbappends which are only applied when that
+# layer is included in our configuration
+BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
+               for layer in BBFILE_COLLECTIONS.split())}"
+
 BBFILE_COLLECTIONS += "mentor"
 BBFILE_PRIORITY_mentor = "10"
 BBFILE_PATTERN_mentor = "^${LAYERDIR}/"
-
-BB_DANGLINGAPPENDS_WARNONLY = "1"
-- 
1.7.9.5