diff options
-rw-r--r-- | meta-systemd/conf/layer.conf | 18 | ||||
-rw-r--r-- | meta-systemd/invalid.bb | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/meta-systemd/conf/layer.conf b/meta-systemd/conf/layer.conf index 3310abc8af..d06cfa138e 100644 --- a/meta-systemd/conf/layer.conf +++ b/meta-systemd/conf/layer.conf @@ -12,7 +12,23 @@ 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}/" diff --git a/meta-systemd/invalid.bb b/meta-systemd/invalid.bb new file mode 100644 index 0000000000..b16787bcee --- /dev/null +++ b/meta-systemd/invalid.bb @@ -0,0 +1,2 @@ +Content of this file is invalid and is used by conf/layer.conf to +ensure that BBFILES is expanded after BBFILE_COLLECTIONS. |