conf: fix meta-virt version / config include

As was reported:

https://lists.yoctoproject.org/g/meta-virtualization/message/4173?p=,,,20,0,0,0::Created,,conf%2Flayer.conf+is+broken,20,2,0,61269733

The conditional include of the meta-virt versions and config was not
working properly due to parse time constraints.

This commit fixes that by following the example of the meta-cube layer
and instead using a user bbclass to load the .inc file after
distro/distro features have been resolved by bitbake.

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

2 files changed, 12 insertions, 1 deletions

diff --git a/classes/meta-virt-cfg.bbclass b/classes/meta-virt-cfg.bbclass
new file mode 100644
index 00000000..bf63a06f
--- /dev/null
+++ b/classes/meta-virt-cfg.bbclass
@@ -0,0 +1,6 @@
+# We need to load the meta-virt config components, only if "virtualization"
+# is in the distro features.  Since we don't know the distro flags during
+# 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
diff --git a/conf/layer.conf b/conf/layer.conf
index dfca6dac..89e5ac2b 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -40,4 +40,9 @@ PREFERRED_PROVIDER_virtual/docker ?= "docker-ce"
 # Setting SKIP_META_VIRT_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-virt"
 
-require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-default-versions.inc', '', d)}
+# We need to load the meta-virt config components, only if "virtualization"
+# is in the distro features.  Since we don't know the distro flags during
+# layer.conf load time, we delay using a special bbclass that simply includes
+# the META_VIRT_CONFIG_PATH file.
+META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc"
+USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}"
\ No newline at end of file