mirror of
git://git.yoctoproject.org/meta-virtualization.git
synced 2025-07-17 03:00:00 +02:00
d876cfc5bf
OEcore/bitbake are moving to use the clearer ":" as an overrides
separator.
This is pass one of updating the meta-virt recipes to use that
syntax.
This has only been minimally build/runtime tested, more changes
will be required for missed overrides, or incorrect conversions
Note: A recent bitbake is required:
commit 75fad23fc06c008a03414a1fc288a8614c6af9ca
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun Jul 18 12:59:15 2021 +0100
bitbake: data_smart/parse: Allow ':' characters in variable/function names
It is becomming increasingly clear we need to find a way to show what
is/is not an override in our syntax. We need to do this in a way which
is clear to users, readable and in a way we can transition to.
The most effective way I've found to this is to use the ":" charater
to directly replace "_" where an override is being specified. This
includes "append", "prepend" and "remove" which are effectively special
override directives.
This patch simply adds the character to the parser so bitbake accepts
the value but maps it back to "_" internally so there is no behaviour
change.
This change is simple enough it could potentially be backported to older
version of bitbake meaning layers using the new syntax/markup could
work with older releases. Even if other no other changes are accepted
at this time and we don't backport, it does set us on a path where at
some point in future we could
require a more explict syntax.
I've tested this patch by converting oe-core/meta-yocto to the new
syntax for overrides (9000+ changes) and then seeing that builds
continue to work with this patch.
(Bitbake rev: 0dbbb4547cb2570d2ce607e9a53459df3c0ac284)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
62 lines
2.3 KiB
Plaintext
62 lines
2.3 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"
|
|
|
|
BBFILES_DYNAMIC += " \
|
|
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bb \
|
|
raspberrypi:${LAYERDIR}/dynamic-layers/raspberrypi/*/*/*.bbappend \
|
|
xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bb \
|
|
xilinx:${LAYERDIR}/dynamic-layers/xilinx/*/*/*.bbappend \
|
|
"
|
|
|
|
# This should only be incremented on significant changes that will
|
|
# cause compatibility issues with other layers
|
|
LAYERVERSION_virtualization-layer = "1"
|
|
LAYERSERIES_COMPAT_virtualization-layer = "hardknott honister"
|
|
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-opencontainers"
|
|
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, and likewise for the Xen and k8s configs
|
|
META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc"
|
|
META_VIRT_XEN_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-xen.inc"
|
|
K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc"
|
|
USER_CLASSES:append = " meta-virt-cfg"
|
|
USER_CLASSES:append = " meta-virt-k8s-cfg"
|
|
USER_CLASSES:append = " meta-virt-xen-cfg"
|
|
|
|
HOSTTOOLS_NONFATAL += "getent"
|