BBPATH .= ":${LAYERDIR}"
# We have a recipes directory, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/*/recipes-*/*/*.bbappend"
+BBFILES += "\
+ ${LAYERDIR}/recipes-*/*/*.bb \
+ ${LAYERDIR}/oe-core/recipes-*/*/*.bbappend \
+ ${LAYERDIR}/meta-oe/recipes-*/*/*.bbappend \
+ ${@base_contains('BBFILE_COLLECTIONS', 'systemd-layer',\
+ '', '${LAYERDIR}/invalid.bb', d)} \
+ ${@base_contains('BBFILE_COLLECTIONS', 'gnome-layer',\
+ '${LAYERDIR}/meta-gnome/recipes-*/*/*.bbappend', '', d)} \
+ ${@base_contains('BBFILE_COLLECTIONS', 'efl-layer',\
+ '${LAYERDIR}/meta-efl/recipes-*/*/*.bbappend', '', d)} \
+ ${@base_contains('BBFILE_COLLECTIONS', 'multimedia-layer',\
+ '${LAYERDIR}/meta-multimedia/recipes-*/*/*.bbappend', '', d)} \
+ ${@base_contains('BBFILE_COLLECTIONS', 'networking',\
+ '${LAYERDIR}/meta-networking/recipes-*/*/*.bbappend', '', d)} \
+ ${@base_contains('BBFILE_COLLECTIONS', 'xfce-layer',\
+ '${LAYERDIR}/meta-xfce/recipes-*/*/*.bbappend', '', d)} \
+"
BBFILE_COLLECTIONS += "systemd-layer"
BBFILE_PATTERN_systemd-layer := "^${LAYERDIR}/"