From b9990c2017ca75398b824bd14072ec7e083aede5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Thu, 11 May 2023 13:53:11 +0200 Subject: [PATCH] cache: Fix nvidia-gpu version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit c9bf7808b6345c7902c46ad11204fc076fb7b894 introduced the logic to properly get the version of nvidia-gpu kernels, but one important part was dropped during the rebase into main, which is actually getting the correct version of the kernel. Fixing this now, and using the old issue as reference. Fixes: #6777 Signed-off-by: Fabiano Fidêncio --- tools/packaging/static-build/cache_components_main.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/packaging/static-build/cache_components_main.sh b/tools/packaging/static-build/cache_components_main.sh index 5c4b56d6ed..599a50f2c9 100755 --- a/tools/packaging/static-build/cache_components_main.sh +++ b/tools/packaging/static-build/cache_components_main.sh @@ -33,7 +33,6 @@ cache_kernel_artifacts() { local kernel_tarball_name="kata-static-${KERNEL_FLAVOUR}.tar.xz" local current_kernel_image="$(get_kernel_image_name)" local current_kernel_kata_config_version="$(cat ${repo_root_dir}/tools/packaging/kernel/kata_config_version)" - local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")" local kernel_modules_tarball_path="${repo_root_dir}/tools/packaging/kata-deploy/local-build/build/kata-static-kernel-sev-modules.tar.xz" # The ${vendor}-gpu kernels are based on an already existing entry, and does not require @@ -49,6 +48,7 @@ cache_kernel_artifacts() { ;; esac + local current_kernel_version="$(get_from_kata_deps "assets.${KERNEL_FLAVOUR}.version")" if [[ "${KERNEL_FLAVOUR}" == "kernel-sev" ]]; then current_kernel_version="$(get_from_kata_deps "assets.kernel.sev.version")" fi