From 8125f5dc97fd9db3c6fb3d431dd158f2b90f739d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 11 Jan 2023 12:08:30 +0100 Subject: [PATCH] packaging: Take toolchain version when using the td-shim builder image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the toolchain is installed in the image itself, we *must* take the toolchain into consideration when deciding whether to use a cached image or building a new one. Fixes: #6033 Signed-off-by: Fabiano Fidêncio --- tools/packaging/scripts/lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/scripts/lib.sh b/tools/packaging/scripts/lib.sh index b14689ae1e..ef74acad33 100755 --- a/tools/packaging/scripts/lib.sh +++ b/tools/packaging/scripts/lib.sh @@ -216,7 +216,7 @@ get_shim_v2_image_name() { get_td_shim_image_name() { td_shim_script_dir="${this_script_dir}/../static-build/td-shim" - echo "${CC_BUILDER_REGISTRY}:td-shim-$(get_last_modification ${td_shim_script_dir})-$(uname -m)" + echo "${CC_BUILDER_REGISTRY}:td-shim-$(get_from_kata_deps "externals.td-shim.toolchain")-$(get_last_modification ${td_shim_script_dir})-$(uname -m)" } get_virtiofsd_image_name() {