From d007bb8550be58aafa8c9bdf7a729146f219c81e Mon Sep 17 00:00:00 2001 From: Joao Vanzuita Date: Sun, 1 Aug 2021 09:52:59 +0200 Subject: [PATCH] kata-deploy: shorten directory path long file paths are difficult to read, this change adds a new readonly variable to shorten the full file path of the static build folder files. Fixes: #2354 Signed-off-by: Joao Vanzuita --- .../kata-deploy/local-build/kata-deploy-binaries.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index 410af1173..0d4be8b03 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -16,15 +16,17 @@ readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly prefix="/opt/kata" readonly repo_root_dir="$(cd "${script_dir}/../../../.." && pwd)" +readonly static_build_dir="${repo_root_dir}/tools/packaging/static-build" readonly version_file="${repo_root_dir}/VERSION" readonly versions_yaml="${repo_root_dir}/versions.yaml" -readonly clh_builder="${repo_root_dir}/tools/packaging/static-build/cloud-hypervisor/build-static-clh.sh" -readonly firecracker_builder="${repo_root_dir}/tools/packaging/static-build/firecracker/build-static-firecracker.sh" -readonly kernel_builder="${repo_root_dir}/tools/packaging/static-build/kernel/build.sh" -readonly qemu_builder="${repo_root_dir}/tools/packaging/static-build/qemu/build-static-qemu.sh" +readonly clh_builder="${static_build_dir}/cloud-hypervisor/build-static-clh.sh" +readonly firecracker_builder="${static_build_dir}/firecracker/build-static-firecracker.sh" +readonly kernel_builder="${static_build_dir}/kernel/build.sh" +readonly qemu_builder="${static_build_dir}/qemu/build-static-qemu.sh" +readonly shimv2_builder="${static_build_dir}/shim-v2/build.sh" + readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh" -readonly shimv2_builder="${repo_root_dir}/tools/packaging/static-build/shim-v2/build.sh" workdir="${WORKDIR:-$PWD}"