From ae6e8d2b38d0242ab7c106d19b7c4b3a74b400f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 21 Jul 2023 11:59:59 +0200 Subject: [PATCH] kata-deploy: Properly get the path of the versions.yaml file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to correctly get the full path of the versions.yaml file as part of the merge-builds.sh script, as we do a `pushd` there and that leads to a fail merging the artefacts as the `versions.yaml` file does not exists in that path. Fixes: #7405 Signed-off-by: Fabiano FidĂȘncio --- .../kata-deploy/local-build/kata-deploy-merge-builds.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh index ff13708ef858..ff5ed3e4f150 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-merge-builds.sh @@ -14,6 +14,7 @@ kata_build_dir=${1:-build} kata_versions_yaml_file=${2:-""} tar_path="${PWD}/kata-static.tar.xz" +kata_versions_yaml_file_path="${PWD}/${kata_versions_yaml_file}" pushd "${kata_build_dir}" tarball_content_dir="${PWD}/kata-tarball-content" @@ -32,7 +33,7 @@ pushd ${tarball_content_dir} prefix=${shim_path%"bin/${shim}"} echo "$(git describe)" > ${prefix}/VERSION - [[ -n "${kata_versions_yaml_file}" ]] && cp ${kata_versions_yaml_file} ${prefix}/ + [[ -n "${kata_versions_yaml_file}" ]] && cp ${kata_versions_yaml_file_path} ${prefix}/ popd echo "create ${tar_path}"