From 947678262ae85f214a306ff41d7352485c8d5a03 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 11 Mar 2026 23:34:27 +0000 Subject: 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 --- classes/meta-virt-container-cfg.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') 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)}" -- cgit v1.2.3-54-g00ecf