From 3a7d446fa94787eda0bcc2f3759e07db5bda6b2f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 10 Feb 2020 10:27:56 -0500 Subject: 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 --- classes/meta-virt-cfg.bbclass | 2 +- classes/meta-virt-k8s-cfg.bbclass | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/meta-virt-cfg.bbclass b/classes/meta-virt-cfg.bbclass index bf63a06f..a20f9fea 100644 --- a/classes/meta-virt-cfg.bbclass +++ b/classes/meta-virt-cfg.bbclass @@ -3,4 +3,4 @@ # layer.conf load time, we delay using a special bbclass that simply includes # the META_VIRT_CONFIG_PATH file. -include ${META_VIRT_CONFIG_PATH} \ No newline at end of file +include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${META_VIRT_CONFIG_PATH}', '', d)} 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 @@ # layer.conf load time, we delay using a special bbclass that simply includes # the K8S_CONFIG_PATH file. -include ${K8S_CONFIG_PATH} +include ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', '${K8S_CONFIG_PATH}', '', d)} -- cgit v1.2.3-54-g00ecf