summaryrefslogtreecommitdiffstats
path: root/classes/meta-virt-k8s-cfg.bbclass
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2020-02-10 10:27:56 -0500
committerBruce Ashfield <bruce.ashfield@gmail.com>2020-02-10 10:28:38 -0500
commit3a7d446fa94787eda0bcc2f3759e07db5bda6b2f (patch)
tree289c4722c2244e2c993893e58934b0f8b24576a6 /classes/meta-virt-k8s-cfg.bbclass
parentc1bc3963ba98834c835b780114151d6b31dd0261 (diff)
downloadmeta-virtualization-3a7d446fa94787eda0bcc2f3759e07db5bda6b2f.tar.gz
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>
Diffstat (limited to 'classes/meta-virt-k8s-cfg.bbclass')
-rw-r--r--classes/meta-virt-k8s-cfg.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/meta-virt-k8s-cfg.bbclass b/classes/meta-virt-k8s-cfg.bbclass
index 1be0a5c8..f1d7f81e 100644
--- a/classes/meta-virt-k8s-cfg.bbclass
+++ b/classes/meta-virt-k8s-cfg.bbclass
@@ -3,4 +3,4 @@
3# layer.conf load time, we delay using a special bbclass that simply includes 3# layer.conf load time, we delay using a special bbclass that simply includes
4# the K8S_CONFIG_PATH file. 4# the K8S_CONFIG_PATH file.
5 5
6include ${K8S_CONFIG_PATH} 6include ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', '${K8S_CONFIG_PATH}', '', d)}