From 3c21a46020bd0816579648f684c41dbd6333583e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 26 Nov 2012 15:01:16 +0000 Subject: meta-systemd: select recipes based on active collections Recipes of inactivate layers must been BBMASK'ed to prevent build errors. This is very unflexible and causes high maintenance effort for keeping the project configuration in sync with the actual meta-systemd layout. With this patch, the .bbappend files within the meta-* directories are ignored unless the corresponding collection has been selected. As it relies on the order of BBFILES and BBFILE_COLLECTIONS expansion, a sanity check has been added which aborts the build when assumptions do not apply anymore. MJ: added meta-xfce as it was created later MJ: fixed expression for oe-core bbappends Signed-off-by: Enrico Scholz Signed-off-by: Martin Jansa --- meta-systemd/conf/layer.conf | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) (limited to 'meta-systemd/conf/layer.conf') 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}/" -- cgit v1.2.3-54-g00ecf