aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2018-07-30 10:37:18 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2018-07-30 10:49:49 +0200
commitb28b6d92f253b29c0927696d61e48f4387269dc1 (patch)
tree7cba244d4052cebf8af6ac561ca9a8b1f9d3ef38
parente28b4d1974e10e5c07340596796fee061a3265ef (diff)
downloadmeta-qcom-b28b6d92f253b29c0927696d61e48f4387269dc1.tar.gz
meta-qcom-b28b6d92f253b29c0927696d61e48f4387269dc1.tar.bz2
meta-qcom-b28b6d92f253b29c0927696d61e48f4387269dc1.zip
layer.conf: include special treatment for meta-backports
meta-backports is a layer that contains various backport from existing OE layers, most of the time to bring newer version of recipes into an OE stable branch. Some meta-qcom users will also use meta-backports, some won't. This patch adds a bit of logic when setting BBFILES so that we can hold patches in meta-qcom that are parsed/used only when meta-backports is also used. Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> (cherry picked from commit f702785495b17d112afb6b6dbfbea4125a18a1ad)
-rw-r--r--conf/layer.conf10
1 files changed, 10 insertions, 0 deletions
diff --git a/conf/layer.conf b/conf/layer.conf
index 0de7f60..5b8551f 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -18,3 +18,13 @@ BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bbappend' % layer \
# Add layer-specific bb files too
BBFILES += "${@' '.join('${LAYERDIR}/%s/recipes*/*/*.bb' % layer \
for layer in BBFILE_COLLECTIONS.split())}"
+
+# Add layer-specific .bb and .bbappend files, when meta-backports is included in the
+# configuration.
+BBFILES += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'backports', \
+ ' '.join('${LAYERDIR}/backports/%s/recipes*/*/*.bbappend' % layer \
+ for layer in BBFILE_COLLECTIONS.split()),'',d)}"
+
+BBFILES += "${@bb.utils.contains('BBFILE_COLLECTIONS', 'backports', \
+ ' '.join('${LAYERDIR}/backports/%s/recipes*/*/*.bb' % layer \
+ for layer in BBFILE_COLLECTIONS.split()),'',d)}"