From 81babac06d287fb022f167989955c1e21dcb76f4 Mon Sep 17 00:00:00 2001 From: Peter Hoyes Date: Wed, 19 Apr 2023 17:00:30 +0100 Subject: [PATCH] zephyr-core/scripts: Resolve West revisions to SHAs The West manifest in Zephyr 3.3 contains a tag (instead of a SHA) for zcbor [1]. OE standard practice is to always specifiy revisions using SHAs, so in the Jinja template, use the new resolve_revision filter to resolve any tags. [1] https://github.com/zephyrproject-rtos/zephyr/pull/51219#discussion_r998123145 Signed-off-by: Peter Hoyes Signed-off-by: Naveen Saini --- meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja b/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja index e18fcf1..2a3faeb 100644 --- a/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja +++ b/meta-zephyr-core/scripts/zephyr-kernel-src.inc.jinja @@ -5,7 +5,7 @@ SRCREV_FORMAT = "default" SRCREV_default = "{{ ('v' ~ version) | resolve_revision(zephyr_url) }}" {% for project in projects -%} -SRCREV_{{ project.name }} = "{{ project.revision }}" +SRCREV_{{ project.name }} = "{{ project.revision | resolve_revision(project.url) }}" {% endfor %} SRC_URI_ZEPHYR ?= "{{ zephyr_url | git_url_to_bitbake }}" {%- for project in projects %}