diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-10 10:27:56 -0500 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-02-10 10:28:38 -0500 |
| commit | 3a7d446fa94787eda0bcc2f3759e07db5bda6b2f (patch) | |
| tree | 289c4722c2244e2c993893e58934b0f8b24576a6 | |
| parent | c1bc3963ba98834c835b780114151d6b31dd0261 (diff) | |
| download | meta-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>
| -rw-r--r-- | classes/meta-virt-cfg.bbclass | 2 | ||||
| -rw-r--r-- | classes/meta-virt-k8s-cfg.bbclass | 2 | ||||
| -rw-r--r-- | conf/layer.conf | 4 |
3 files changed, 4 insertions, 4 deletions
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 @@ | |||
| 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 META_VIRT_CONFIG_PATH file. | 4 | # the META_VIRT_CONFIG_PATH file. |
| 5 | 5 | ||
| 6 | include ${META_VIRT_CONFIG_PATH} \ No newline at end of file | 6 | 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 @@ | |||
| 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 | ||
| 6 | include ${K8S_CONFIG_PATH} | 6 | include ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', '${K8S_CONFIG_PATH}', '', d)} |
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" | |||
| 46 | # the META_VIRT_CONFIG_PATH file, and likewise for the k8s configs | 46 | # the META_VIRT_CONFIG_PATH file, and likewise for the k8s configs |
| 47 | META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" | 47 | META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" |
| 48 | K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" | 48 | K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" |
| 49 | USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}" | 49 | USER_CLASSES_append = " meta-virt-cfg" |
| 50 | USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', 'meta-virt-k8s-cfg', '', d)}" | 50 | USER_CLASSES_append = " meta-virt-k8s-cfg" |