mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-05 02:50:46 +00:00
Code Issues Projects Releases Wiki Activity

meta-systemd: select recipes based on active collections

Browse Source 
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 <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Enrico Scholz
2012-11-26 15:01:16 +00:00
committed by Martin Jansa
parent 616c8ec151
commit 3c21a46020
2 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-systemd/conf/layer.conf
+17 -1
View File
@@ -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}/"
meta-systemd/invalid.bb
+2
View File
@@ -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.