diff options
| author |   takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
|---|---|---|
| committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
| commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
| tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-virtualization/conf/layer.conf | |
| parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) | |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-virtualization/conf/layer.conf')
| -rw-r--r-- | external/meta-virtualization/conf/layer.conf | 13 |
1 files changed, 11 insertions, 2 deletions
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" |