conf: make container recipes parseable when virtualization is not set

The container stack flexibilty features set defaults (like other
parts of the layer) when 'virtualization' is in the distro features.

That reqirement means that the recipes fail parsing and QA checks
when the distro feature isn't enabled.

The defaults are currently safe for a virtualization enabled and
disabled configuration, so we include them in either case.

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

1 files changed, 5 insertions, 1 deletions

diff --git a/classes/meta-virt-container-cfg.bbclass b/classes/meta-virt-container-cfg.bbclass
index 0688f525..9a4b144e 100644
--- a/classes/meta-virt-container-cfg.bbclass
+++ b/classes/meta-virt-container-cfg.bbclass
@@ -3,4 +3,8 @@
 # layer.conf load time, we delay using a special bbclass that simply includes
 # the META_VIRT_CONTAINER_CONFIG_PATH file.
 
-include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${META_VIRT_CONTAINER_CONFIG_PATH}', '', d)}
+# the defaults are valid if we do or don't have virtualization enabled, so
+# we include it in either case below. But we leave the pattern in place, to
+# 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)}