Merge branch 'next'

[AGL/meta-agl.git] / meta-security / conf / layer.conf

diff --git a/meta-security/conf/layer.conf b/meta-security/conf/layer.conf
index c051e58..6024d28 100644 (file)
--- a/meta-security/conf/layer.conf
+++ b/meta-security/conf/layer.conf
@@ -2,11 +2,13 @@
 BBPATH =. "${LAYERDIR}:"
 
 # We have a packages directory, add to BBFILES
-BBFILES := "${BBFILES} \
-            ${LAYERDIR}/recipes-*/*/*.bb \
-            ${LAYERDIR}/recipes-*/*/*.bbappend"
+BBFILES += " ${LAYERDIR}/recipes-*/*/*.bb \
+             ${LAYERDIR}/recipes-*/*/*.bbappend \
+           "
 
 # Must prioritize our rpm recipe over the default ones.
 BBFILE_COLLECTIONS += "security-smack"
 BBFILE_PATTERN_security-smack := "^${LAYERDIR}/"
-BBFILE_PRIORITY_security-smack = "8"
+BBFILE_PRIORITY_security-smack = "60"
+
+LAYERSERIES_COMPAT_security-smack = "dunfell"