diff options
Diffstat (limited to 'external/meta-virtualization/conf')
3 files changed, 13 insertions, 9 deletions
diff --git a/external/meta-virtualization/conf/distro/include/k8s-versions.inc b/external/meta-virtualization/conf/distro/include/k8s-versions.inc new file mode 100644 index 00000000..b4ec6b63 --- /dev/null +++ b/external/meta-virtualization/conf/distro/include/k8s-versions.inc @@ -0,0 +1 @@ +# placeholder for k8s specific versions diff --git a/external/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc b/external/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc index 27e7b90d..299b5dfc 100644 --- a/external/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc +++ b/external/meta-virtualization/conf/distro/include/meta-virt-default-versions.inc @@ -1,9 +1,3 @@ # Meta-virtuailization PREFERED_VERSION -PREFERRED_VERSION_python-blinker = "1.3" -PREFERRED_VERSION_python-gevent = "1.0.1" -PREFERRED_VERSION_python-m2crypto = "0.22.3" -PREFERRED_VERSION_python-pyyaml = "3.11" -PREFERRED_VERSION_python-redis = "2.10.3" -PREFERRED_VERSION_python-sqlalchemy = "1.1.5" -PREFERRED_VERSION_python-werkzeug = "0.10.4" +# placeholder for preferred versions diff --git a/external/meta-virtualization/conf/layer.conf b/external/meta-virtualization/conf/layer.conf index dc42e603..697fb622 100644 --- a/external/meta-virtualization/conf/layer.conf +++ b/external/meta-virtualization/conf/layer.conf @@ -14,7 +14,7 @@ LICENSE_PATH += "${LAYERDIR}/files/custom-licenses" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_virtualization-layer = "1" -LAYERSERIES_COMPAT_virtualization-layer = "sumo thud" +LAYERSERIES_COMPAT_virtualization-layer = "zeus dunfell" LAYERDEPENDS_virtualization-layer = " \ core \ openembedded-layer \ @@ -26,6 +26,7 @@ LAYERDEPENDS_virtualization-layer = " \ # webserver: naigos requires apache2 LAYERRECOMMENDS_virtualization-layer = " \ webserver \ + selinux \ " # Override security flags @@ -33,9 +34,17 @@ require conf/distro/include/virt_security_flags.inc PREFERRED_PROVIDER_virtual/runc ?= "runc-docker" 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" -require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-default-versions.inc', '', d)} +# 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 k8s configs +META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" +K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" +USER_CLASSES_append = " meta-virt-cfg" +USER_CLASSES_append = " meta-virt-k8s-cfg" |