Adjust the way the PREFERRED_VERSION happens to allow us to use the same logic in layers that depend on this one.
Signed-off-by: Mark Hatle <[email protected]> --- meta-xilinx-standalone/conf/layer.conf | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf index 84d83673..ef4a919e 100644 --- a/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx-standalone/conf/layer.conf @@ -17,7 +17,12 @@ LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" LAYERSERIES_COMPAT_xilinx-standalone = "scarthgap" -PREFERRED_VERSION_plm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" -PREFERRED_VERSION_psm-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" -PREFERRED_VERSION_pmu-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" -PREFERRED_VERSION_fsbl-firmware ?= "${@d.getVar("XILINX_RELEASE_VERSION").replace('v','')}%" +# What version of ESW and related should we default to? +# Note, there is no 'esw' recipe, but we're going to use this for all +# of the related items in this layer. +PREFERRED_VERSION_esw ??= "${@(d.getVar('XILINX_RELEASE_VERSION') or 'undefined').replace('v', '')}" + +PREFERRED_VERSION_plm-firmware ??= "${PREFERRED_VERSION_esw}%" +PREFERRED_VERSION_psm-firmware ??= "${PREFERRED_VERSION_esw}%" +PREFERRED_VERSION_pmu-firmware ??= "${PREFERRED_VERSION_esw}%" +PREFERRED_VERSION_fsbl-firmware ??= "${PREFERRED_VERSION_esw}%" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#5373): https://lists.yoctoproject.org/g/meta-xilinx/message/5373 Mute This Topic: https://lists.yoctoproject.org/mt/106609957/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-xilinx/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
