1 files changed, 8 insertions, 3 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index 7c8e3701..43a39f50 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -21,7 +21,7 @@ BBFILES_DYNAMIC += " \
 # This should only be incremented on significant changes that will
 # cause compatibility issues with other layers
 LAYERVERSION_virtualization-layer = "1"
-LAYERSERIES_COMPAT_virtualization-layer = "nanbield scarthgap"
+LAYERSERIES_COMPAT_virtualization-layer = "walnascar whinlatter"
 LAYERDEPENDS_virtualization-layer = " \
     core \
     openembedded-layer \
@@ -40,9 +40,14 @@ LAYERRECOMMENDS_virtualization-layer = " \
 require conf/distro/include/virt_security_flags.inc
 
 PREFERRED_PROVIDER_virtual/runc ?= "runc-opencontainers"
-PREFERRED_PROVIDER_virtual/containerd ?= "containerd-opencontainers"
+PREFERRED_PROVIDER_virtual/containerd ?= "containerd"
 PREFERRED_PROVIDER_virtual/docker ?= "docker-moby"
 
+# profile can be: docker, podman, containerd, k3s, k8s, runc
+CONTAINER_PROFILE ?= "default"
+# virt profile can be: kvm, xen, runx
+VIRTUALIZATION_PROFILE ?= "default"
+
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-virt"
@@ -52,7 +57,7 @@ INHERIT += "sanity-meta-virt"
 # 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_CONTAINER_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-container.inc"
+META_VIRT_CONTAINER_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-container-${CONTAINER_PROFILE}.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"