8 files changed, 96 insertions, 15 deletions

diff --git a/conf/distro/include/meta-virt-container-containerd.inc b/conf/distro/include/meta-virt-container-containerd.inc
new file mode 100644
index 00000000..73438298
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-containerd.inc
@@ -0,0 +1,17 @@
+include meta-virt-container.inc
+
+## CNCF "components"
+
+# engines: docker/docker-moby, virtual-containerd, cri-o, podman, lxc
+VIRTUAL-RUNTIME_container_engine ??= "containerd"
+# runtime: runc, crun, runv, runx
+VIRTUAL-RUNTIME_container_runtime ??= "crun"
+# networking: cni, netavark
+VIRTUAL-RUNTIME_container_networking ??= "cni"
+# dns: cni, aardvark-dns
+VIRTUAL-RUNTIME_container_dns ??= ""
+# orchestration: k8s, k3s
+VIRTUAL-RUNTIME_container_orchestration ??= ""
+
+VIRTUAL-RUNTIME_cri ??= "virtual-containerd"
+VIRTUAL-RUNTIME_cni ??= "cni"
diff --git a/conf/distro/include/meta-virt-container-default.inc b/conf/distro/include/meta-virt-container-default.inc
new file mode 100644
index 00000000..0a3d621f
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-default.inc
@@ -0,0 +1,19 @@
+include meta-virt-container.inc
+
+## CNCF "components"
+
+# engines: docker/docker-moby, virtual-containerd, cri-o, podman, lxc
+VIRTUAL-RUNTIME_container_engine ??= "docker"
+# runtime: runc, crun, runv, runx
+VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc"
+# networking: cni, netavark
+VIRTUAL-RUNTIME_container_networking ??= "cni"
+# dns: cni, aardvark-dns
+VIRTUAL-RUNTIME_container_dns ??= "cni"
+# orchestration: k8s, k3s
+VIRTUAL-RUNTIME_container_orchestration ??= ""
+
+## Kubernetes terminology "components"
+
+VIRTUAL-RUNTIME_cri ??= "virtual-containerd"
+VIRTUAL-RUNTIME_cni ??= "cni"
diff --git a/conf/distro/include/meta-virt-container-docker.inc b/conf/distro/include/meta-virt-container-docker.inc
new file mode 100644
index 00000000..a82dd5e2
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-docker.inc
@@ -0,0 +1,17 @@
+include meta-virt-container.inc
+
+## CNCF "components"
+
+# engines: docker/docker-moby, virtual-containerd, cri-o, podman, lxc
+VIRTUAL-RUNTIME_container_engine ??= "docker-moby"
+# runtime: runc, crun, runv, runx
+VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc"
+# networking: cni, netavark
+VIRTUAL-RUNTIME_container_networking ??= ""
+# dns: cni, aardvark-dns
+VIRTUAL-RUNTIME_container_dns ??= ""
+# orchestration: k8s, k3s
+VIRTUAL-RUNTIME_container_orchestration ??= ""
+
+VIRTUAL-RUNTIME_cri ??= "virtual-containerd"
+VIRTUAL-RUNTIME_cni ??= "cni"
diff --git a/conf/distro/include/meta-virt-container-k3s-host.inc b/conf/distro/include/meta-virt-container-k3s-host.inc
new file mode 100644
index 00000000..166d7cf1
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-k3s-host.inc
@@ -0,0 +1,11 @@
+include meta-virt-container.inc
+
+VIRTUAL-RUNTIME_container_engine ?= ""
+VIRTUAL-RUNTIME_container_runtime ?= ""
+VIRTUAL-RUNTIME_container_networking ?= ""
+VIRTUAL-RUNTIME_container_dns ?= ""
+VIRTUAL-RUNTIME_container_orchestration ?= "k3s-host"
+
+## Kubernetes terminology "components"
+VIRTUAL-RUNTIME_cri ?= "virtual-containerd"
+VIRTUAL-RUNTIME_cni ?= "cni"
diff --git a/conf/distro/include/meta-virt-container-k3s-node.inc b/conf/distro/include/meta-virt-container-k3s-node.inc
new file mode 100644
index 00000000..46ac71f1
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-k3s-node.inc
@@ -0,0 +1,4 @@
+require meta-virt-container-k3s-host.inc
+
+VIRTUAL-RUNTIME_container_orchestration = "k3s-node"
+
diff --git a/conf/distro/include/meta-virt-container-podman.inc b/conf/distro/include/meta-virt-container-podman.inc
new file mode 100644
index 00000000..b57eaaca
--- /dev/null
+++ b/conf/distro/include/meta-virt-container-podman.inc
@@ -0,0 +1,11 @@
+include meta-virt-container.inc
+
+VIRTUAL-RUNTIME_container_engine ?= "podman"
+VIRTUAL-RUNTIME_container_runtime ?= "crun"
+VIRTUAL-RUNTIME_container_networking ?= "netavark"
+VIRTUAL-RUNTIME_container_dns ?= "aardvark-dns"
+VIRTUAL-RUNTIME_container_orchestration ?= ""
+
+## Kubernetes terminology "components"
+VIRTUAL-RUNTIME_cri ?= "virtual-containerd"
+VIRTUAL-RUNTIME_cni ?= "cni"
diff --git a/conf/distro/include/meta-virt-container.inc b/conf/distro/include/meta-virt-container.inc
index c3ac8394..d3e91eef 100644
--- a/conf/distro/include/meta-virt-container.inc
+++ b/conf/distro/include/meta-virt-container.inc
@@ -21,20 +21,22 @@
 # conflicting on target or causing runtime issues / errors.
 #
 
-## CNCF "components"
+#### CNCF "components"
 
-# engines: docker-ce/docker-moby, virtual-containerd, cri-o, podman
-VIRTUAL-RUNTIME_container_engine ??= "podman"
-# runtime: runc, crun, runv, runx
-VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc"
-# networking: cni, netavark
-VIRTUAL-RUNTIME_container_networking ??= "cni"
-# dns: cni, aardvark-dns
-VIRTUAL-RUNTIME_container_dns ??= "cni"
-# orchestration: k8s, k3s
-VIRTUAL-RUNTIME_container_orchestration ??= "k3s"
+## engines: docker/docker-moby, virtual-containerd, cri-o, podman, lxc
+# VIRTUAL-RUNTIME_container_engine ??= "podman"
+## runtime: runc, crun, runv, runx
+# VIRTUAL-RUNTIME_container_runtime ??= "virtual-runc"
+## networking: cni, netavark
+# VIRTUAL-RUNTIME_container_networking ??= "cni"
+## dns: cni, aardvark-dns
+# VIRTUAL-RUNTIME_container_dns ??= "cni"
+## orchestration: k8s, k3s
+# VIRTUAL-RUNTIME_container_orchestration ??= "k3s"
 
 ## Kubernetes terminology "components"
+# VIRTUAL-RUNTIME_cri ??= "virtual-containerd"
+# VIRTUAL-RUNTIME_cni ??= "cni"
 
-VIRTUAL-RUNTIME_cri ??= "virtual-containerd"
-VIRTUAL-RUNTIME_cni ??= "cni"
+CONTAINER_RO_REMOVE ?= " ${@bb.utils.contains('VIRTUAL-RUNTIME_container_engine', 'podman', 'shadow', '', d)}"
+ROOTFS_RO_UNNEEDED:remove = "${CONTAINER_RO_REMOVE}"
diff --git a/conf/distro/include/meta-virt-default-versions.inc b/conf/distro/include/meta-virt-default-versions.inc
index b62ec38d..7a1a655f 100644
--- a/conf/distro/include/meta-virt-default-versions.inc
+++ b/conf/distro/include/meta-virt-default-versions.inc
@@ -1,4 +1,4 @@
 # Meta-virtuailization PREFERED_VERSION
 
-PREFERRED_VERSION_xen ?= "4.18+stable%"
-PREFERRED_VERSION_xen-tools ?= "4.18+stable%"
+PREFERRED_VERSION_xen ?= "4.20%"
+PREFERRED_VERSION_xen-tools ?= "4.20%"