Merge pull request #6963 from dborquez/CCv0

kata-deploy: Remove trailing and leading white spaces in kata-deploy-binaries.sh
This commit is contained in:
GabyCT 2023-05-25 09:22:18 -06:00 committed by GitHub
commit 4ab93e662c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -266,7 +266,7 @@ install_cc_image() {
root_hash_vanilla="" root_hash_vanilla=""
initramfs_last_commit="$(get_initramfs_image_name)" initramfs_last_commit="$(get_initramfs_image_name)"
fi fi
fi fi
local osbuilder_last_commit="$(echo $(get_last_modification "${repo_root_dir}/tools/osbuilder") | sed s/-dirty//)" local osbuilder_last_commit="$(echo $(get_last_modification "${repo_root_dir}/tools/osbuilder") | sed s/-dirty//)"
local guest_image_last_commit="$(get_last_modification "${repo_root_dir}/tools/packaging/guest-image")" local guest_image_last_commit="$(get_last_modification "${repo_root_dir}/tools/packaging/guest-image")"
@ -445,7 +445,7 @@ install_cached_kernel_component() {
"kata-static-cc-sev-kernel-modules.tar.xz" \ "kata-static-cc-sev-kernel-modules.tar.xz" \
"${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" \ "${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" \
|| return 1 || return 1
mkdir -p "${module_dir}" mkdir -p "${module_dir}"
tar xvf "${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" -C "${module_dir}" && return 0 tar xvf "${workdir}/kata-static-cc-sev-kernel-modules.tar.xz" -C "${module_dir}" && return 0
@ -949,7 +949,7 @@ handle_build() {
cc-tdx-tdvf) install_cc_tdx_tdvf ;; cc-tdx-tdvf) install_cc_tdx_tdvf ;;
cc-sev-ovmf) install_cc_sev_ovmf ;; cc-sev-ovmf) install_cc_sev_ovmf ;;
cc-x86_64-ovmf) install_cc_x86_64_ovmf ;; cc-x86_64-ovmf) install_cc_x86_64_ovmf ;;
cloud-hypervisor) install_clh ;; cloud-hypervisor) install_clh ;;