diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-10-21 01:49:13 +0000 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2024-11-15 19:50:00 +0000 |
commit | 3857974ed93bda2361ecdeb670b7f03bd257539f (patch) | |
tree | 5b2ee3237a6742f22f3107d9985227b3d7e665d2 | |
parent | e8f51968a2a49ba9bc796129f7b167f08ad2eaf5 (diff) | |
download | meta-virtualization-3857974ed93bda2361ecdeb670b7f03bd257539f.tar.gz |
conf: meta-virt-container.inc comment out values as reference
This .inc file is no longer the active one by default, so we
will use it a reference for the possible values. To make that
more obvious, we comment out the current values.
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | conf/distro/include/meta-virt-container.inc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/conf/distro/include/meta-virt-container.inc b/conf/distro/include/meta-virt-container.inc index 6382ac37..d3e91eef 100644 --- a/conf/distro/include/meta-virt-container.inc +++ b/conf/distro/include/meta-virt-container.inc | |||
@@ -21,23 +21,22 @@ | |||
21 | # conflicting on target or causing runtime issues / errors. | 21 | # conflicting on target or causing runtime issues / errors. |
22 | # | 22 | # |
23 | 23 | ||
24 | ## CNCF "components" | 24 | #### CNCF "components" |
25 | 25 | ||
26 | # engines: docker-ce/docker-moby, virtual-containerd, cri-o, podman | 26 | ## engines: docker/docker-moby, virtual-containerd, cri-o, podman, lxc |
27 | VIRTUAL-RUNTIME_container_engine ??= "podman" | 27 | # VIRTUAL-RUNTIME_container_engine ??= "podman" |
28 | # runtime: runc, crun, runv, runx | 28 | ## runtime: runc, crun, runv, runx |
29 | VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc" | 29 | # VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc" |
30 | # networking: cni, netavark | 30 | ## networking: cni, netavark |
31 | VIRTUAL-RUNTIME_container_networking ??= "cni" | 31 | # VIRTUAL-RUNTIME_container_networking ??= "cni" |
32 | # dns: cni, aardvark-dns | 32 | ## dns: cni, aardvark-dns |
33 | VIRTUAL-RUNTIME_container_dns ??= "cni" | 33 | # VIRTUAL-RUNTIME_container_dns ??= "cni" |
34 | # orchestration: k8s, k3s | 34 | ## orchestration: k8s, k3s |
35 | VIRTUAL-RUNTIME_container_orchestration ??= "k3s" | 35 | # VIRTUAL-RUNTIME_container_orchestration ??= "k3s" |
36 | 36 | ||
37 | ## Kubernetes terminology "components" | 37 | ## Kubernetes terminology "components" |
38 | 38 | # VIRTUAL-RUNTIME_cri ??= "virtual-containerd" | |
39 | VIRTUAL-RUNTIME_cri ??= "virtual-containerd" | 39 | # VIRTUAL-RUNTIME_cni ??= "cni" |
40 | VIRTUAL-RUNTIME_cni ??= "cni" | ||
41 | 40 | ||
42 | CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}" | 41 | CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}" |
43 | ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}" | 42 | ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}" |