mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-20 10:41:54 +00:00
3c21a46020
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>
45 lines
1.9 KiB
Plaintext
45 lines
1.9 KiB
Plaintext
# It really depends on order of the layers appearing in BBLAYERS
|
|
# variable in toplevel bblayers.conf file, where bitbake will search
|
|
# for .inc files and others where bitbake uses BBPATH since it will
|
|
# search the directories from first to last as specified in BBPATH
|
|
# Therefore if you want a given layer to be considered high priority
|
|
# for the .inc and .conf etc. then consider it adding at the beginning
|
|
# of BBPATH. For bblayers bitbake will use BBFILES_PRIORITY to resolve
|
|
# the recipe contention so the order of directories in BBFILES does
|
|
# not matter.
|
|
|
|
# We have a conf and classes directory, append to BBPATH
|
|
BBPATH .= ":${LAYERDIR}"
|
|
|
|
# We have a recipes directory, add to BBFILES
|
|
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}/"
|
|
|
|
# Define the priority for recipes (.bb files) from this layer,
|
|
# choosing carefully how this layer interacts with all of the
|
|
# other layers.
|
|
|
|
BBFILE_PRIORITY_systemd-layer = "7"
|
|
|
|
SIGGEN_EXCLUDERECIPES_ABISAFE += " \
|
|
systemd-serialgetty \
|
|
"
|