mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-19 12:50:22 +02:00
b4dfe90a5e
As was reported: https://lists.yoctoproject.org/g/meta-virtualization/message/4173?p=,,,20,0,0,0::Created,,conf%2Flayer.conf+is+broken,20,2,0,61269733 The conditional include of the meta-virt versions and config was not working properly due to parse time constraints. This commit fixes that by following the example of the meta-cube layer and instead using a user bbclass to load the .inc file after distro/distro features have been resolved by bitbake. Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
48 lines
1.8 KiB
Plaintext
48 lines
1.8 KiB
Plaintext
# 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}/recipes*/*/*.bbappend"
|
|
|
|
BBFILE_COLLECTIONS += "virtualization-layer"
|
|
BBFILE_PATTERN_virtualization-layer := "^${LAYERDIR}/"
|
|
BBFILE_PRIORITY_virtualization-layer = "8"
|
|
|
|
# Custom licenses used by some packages in this layer
|
|
LICENSE_PATH += "${LAYERDIR}/files/custom-licenses"
|
|
|
|
# This should only be incremented on significant changes that will
|
|
# cause compatibility issues with other layers
|
|
LAYERVERSION_virtualization-layer = "1"
|
|
LAYERSERIES_COMPAT_virtualization-layer = "thud warrior zeus"
|
|
LAYERDEPENDS_virtualization-layer = " \
|
|
core \
|
|
openembedded-layer \
|
|
networking-layer \
|
|
filesystems-layer \
|
|
meta-python \
|
|
"
|
|
|
|
# webserver: naigos requires apache2
|
|
LAYERRECOMMENDS_virtualization-layer = " \
|
|
webserver \
|
|
selinux \
|
|
"
|
|
|
|
# Override security flags
|
|
require conf/distro/include/virt_security_flags.inc
|
|
|
|
PREFERRED_PROVIDER_virtual/runc ?= "runc-docker"
|
|
PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
|
|
PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
|
|
|
|
# Sanity check for meta-virtualization layer.
|
|
# Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
|
|
INHERIT += "sanity-meta-virt"
|
|
|
|
# We need to load the meta-virt config components, only if "virtualization"
|
|
# is in the distro features. Since we don't know the distro flags during
|
|
# layer.conf load time, we delay using a special bbclass that simply includes
|
|
# the META_VIRT_CONFIG_PATH file.
|
|
META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc"
|
|
USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}" |