diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-06-15 14:12:57 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2026-06-15 14:12:57 +0000 |
| commit | cfa93b77c8ee3ec2e96861ce82e2f8a458689067 (patch) | |
| tree | 9e62e17adacdaf77b7340b0dd66dd07414de2a9f /recipes-extended | |
| parent | 263a45c610b622ac9b0aab2e715549b270ea6f6e (diff) | |
| download | meta-virtualization-cfa93b77c8ee3ec2e96861ce82e2f8a458689067.tar.gz | |
container-host: add lxc profile
conf/distro/include/ shipped fragments for docker, podman, containerd,
incus, k3s, and k3s-node, with the indirection chain
local.conf : require container-host-${BUILD_PROFILE}.conf
container-host-FOO.conf : CONTAINER_PROFILE = "FOO"
meta-virt-container-cfg.bbclass (USER_CLASSES): include
meta-virt-container-${CONTAINER_PROFILE}.inc
meta-virt-container-FOO.inc : VIRTUAL-RUNTIME_container_engine ??= "FOO"
container-image-host.bb : contains_any('VIRTUAL-RUNTIME_container_engine',
'FOO', 'packagegroup-FOO', '', d)
lxc was not part of that set, even though packagegroup-lxc existed.
Integrators wanting a lxc-flavoured container-image-host had to either
add lxc to CORE_IMAGE_EXTRA_INSTALL by hand or invent their own fragment.
This commit fills in the three missing pieces so lxc becomes a peer of
the existing engines:
conf/distro/include/container-host-lxc.conf
User-facing fragment. Sets CONTAINER_PROFILE = "lxc". This is the
file integrators require from local.conf, same shape as the existing
container-host-incus.conf.
conf/distro/include/meta-virt-container-lxc.inc
Resolved by meta-virt-container-cfg.bbclass from CONTAINER_PROFILE.
Sets VIRTUAL-RUNTIME_container_engine ??= "lxc" and zeroes the
OCI-shaped VIRTUAL-RUNTIME_container_runtime / _networking / _dns
/ _orchestration variables (LXC doesn't use any of the OCI engine
model), matching the incus .inc.
recipes-extended/images/container-image-host.bb
Adds the lxc branch to the engine-selection block, alongside the
existing docker / podman / containerd / incus checks. When
VIRTUAL-RUNTIME_container_engine is "lxc", IMAGE_INSTALL gets
packagegroup-lxc, which (with the recipe + packagegroup changes)
is now lxc + lxc-networking + lxc-templates.
After this change, setting BUILD_PROFILE = "lxc" in local.conf and
building container-image-host produces a guest where lxc-create,
lxc-start, lxc-attach, etc. work against the download template
end-to-end.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-extended')
| -rw-r--r-- | recipes-extended/images/container-image-host.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/recipes-extended/images/container-image-host.bb b/recipes-extended/images/container-image-host.bb index e5a688e5..f3b3085e 100644 --- a/recipes-extended/images/container-image-host.bb +++ b/recipes-extended/images/container-image-host.bb | |||
| @@ -119,6 +119,7 @@ IMAGE_INSTALL = " \ | |||
| 119 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','podman','packagegroup-podman','',d)} \ | 119 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','podman','packagegroup-podman','',d)} \ |
| 120 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','containerd','packagegroup-containerd','',d)} \ | 120 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','containerd','packagegroup-containerd','',d)} \ |
| 121 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','incus','incus','',d)} \ | 121 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','incus','incus','',d)} \ |
| 122 | ${@bb.utils.contains_any('VIRTUAL-RUNTIME_container_engine','lxc','packagegroup-lxc','',d)} \ | ||
| 122 | ${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','cni','packagegroup-cni','',d)} \ | 123 | ${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','cni','packagegroup-cni','',d)} \ |
| 123 | ${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','netavark','packagegroup-netavark','',d)} \ | 124 | ${@bb.utils.contains('VIRTUAL-RUNTIME_container_networking','netavark','packagegroup-netavark','',d)} \ |
| 124 | ${@bb.utils.contains('IMAGE_FEATURES','container-tools','packagegroup-container-tools','',d)} \ | 125 | ${@bb.utils.contains('IMAGE_FEATURES','container-tools','packagegroup-container-tools','',d)} \ |
