conf: defer DISTRO_FEATURE check to bbclass processing

We were using USER_CLASS loading to allow conditional checking
on DISTRO_FEATURES, which triggered distro feature specific version
pinning.

It was found that DISTRO_FEATURES set in local.conf is not
consistently available at layer.conf parse time, hence our checks
were not always working as expected (i.e. the version files are
not included).

If we move the DISTRO_FEATURE check to the bbclasses, and use it
to trigger the include, we should have a consistent set of variable
resolution and consistent behaviour.

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

1 files changed, 2 insertions, 2 deletions

diff --git a/conf/layer.conf b/conf/layer.conf
index d0a7ead0..922cb0d6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -46,5 +46,5 @@ INHERIT += "sanity-meta-virt"
 # 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 = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}"
-USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', 'meta-virt-k8s-cfg', '', d)}"
+USER_CLASSES_append = " meta-virt-cfg"
+USER_CLASSES_append = " meta-virt-k8s-cfg"