container-registry: make IMAGE_FEATURES conditional on distro features

Move the container-registry IMAGE_FEATURES[validitems] registration
from layer.conf into meta-virt-container-cfg.bbclass where it can be
gated on DISTRO_FEATURES. The validitems varflag is now only registered
when vcontainer or virtualization is in DISTRO_FEATURES.

layer.conf is parsed before distro features are known, so inline
Python cannot be used there. The bbclass is loaded via USER_CLASSES
(deferred parsing) and already handles container profile configuration.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

2 files changed, 3 insertions, 6 deletions

diff --git a/classes/meta-virt-container-cfg.bbclass b/classes/meta-virt-container-cfg.bbclass
index 9a4b144e..f797a6aa 100644
--- a/classes/meta-virt-container-cfg.bbclass
+++ b/classes/meta-virt-container-cfg.bbclass
@@ -8,3 +8,6 @@
 # match the other configs of the layer and in case the above statement isn't
 # always true in the future.
 include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${META_VIRT_CONTAINER_CONFIG_PATH}', '${META_VIRT_CONTAINER_CONFIG_PATH}', d)}
+
+# Register custom IMAGE_FEATURES only when container features are enabled
+IMAGE_FEATURES[validitems] += "${@bb.utils.contains_any('DISTRO_FEATURES', 'vcontainer virtualization', 'container-registry', '', d)}"
diff --git a/conf/layer.conf b/conf/layer.conf
index 6eadc87f..cbf95e6a 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -50,12 +50,6 @@ CONTAINER_PROFILE ?= "default"
 # virt profile can be: kvm, xen, runx
 VIRTUALIZATION_PROFILE ?= "default"
 
-# Custom IMAGE_FEATURES for container images
-# container-registry: Install registry config based on container engine
-#   Requires: CONTAINER_REGISTRY_URL (for OCI) or DOCKER_REGISTRY_INSECURE (for Docker)
-#   Usage: IMAGE_FEATURES:append = " container-registry"
-IMAGE_FEATURES[validitems] += "container-registry"
-
 # Sanity check for meta-virtualization layer.
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-virt"