aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-24 00:34:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

CCv0: Merge main into CCv0 branch

Browse Source 
Merge remote-tracking branch 'upstream/main' into CCv0

Fixes: #6504
Signed-off-by: Megan Wright <megan.wright@ibm.com>
This commit is contained in:
Megan Wright
2023-03-20 13:23:49 +00:00
parent 4bd6103253 2fe0733dcb
commit 42978f3e83
71 changed files with 2934 additions and 789 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/packaging/scripts/lib.sh
View File

@@ -185,9 +185,9 @@ sha256sum_from_files() {
}
calc_qemu_files_sha256sum() {
local files="${this_script_dir}/../qemu \
${this_script_dir}/../static-build/qemu.blacklist \
${this_script_dir}/../static-build/scripts"
local files="${this_script_dir}/tools/packaging/qemu \
${this_script_dir}/../tools/packaging/static-build/qemu.blacklist \
${this_script_dir}/../tools/packaging/static-build/scripts"
sha256sum_from_files "$files"
}
@@ -198,7 +198,7 @@ get_initramfs_image_name() {
}
get_kernel_image_name() {
kernel_script_dir="${this_script_dir}/../static-build/kernel"
kernel_script_dir="${repo_root_dir}/tools/packaging/static-build/kernel"
echo "${CC_BUILDER_REGISTRY}:kernel-$(get_last_modification ${kernel_script_dir})-$(uname -m)"
}
@@ -208,13 +208,13 @@ get_ovmf_image_name() {
}
get_qemu_image_name() {
qemu_script_dir="${this_script_dir}/../static-build/qemu"
echo "${CC_BUILDER_REGISTRY}:qemu-$(get_last_modification ${qemu_script_dir})-$(uname -m)"
qemu_script_dir="${repo_root_dir}/tools/packaging/static-build/qemu"
echo "${BUILDER_REGISTRY}:qemu-$(get_last_modification ${qemu_script_dir})-$(uname -m)"
}
get_shim_v2_image_name() {
shim_v2_script_dir="${this_script_dir}/../static-build/shim-v2"
echo "${CC_BUILDER_REGISTRY}:shim-v2-go-$(get_from_kata_deps "languages.golang.meta.newest-version")-rust-$(get_from_kata_deps "languages.rust.meta.newest-version")-$(get_last_modification ${shim_v2_script_dir})-$(uname -m)"
shim_v2_script_dir="${repo_root_dir}/tools/packaging/static-build/shim-v2"
echo "${BUILDER_REGISTRY}:shim-v2-go-$(get_from_kata_deps "languages.golang.meta.newest-version")-rust-$(get_from_kata_deps "languages.rust.meta.newest-version")-$(get_last_modification ${shim_v2_script_dir})-$(uname -m)"
}
get_td_shim_image_name() {
@@ -239,6 +239,6 @@ get_virtiofsd_image_name() {
;;
esac
virtiofsd_script_dir="${this_script_dir}/../static-build/virtiofsd"
virtiofsd_script_dir="${repo_root_dir}/tools/packaging/static-build/virtiofsd"
echo "${CC_BUILDER_REGISTRY}:virtiofsd-$(get_from_kata_deps "externals.virtiofsd.toolchain")-${libc}-$(get_last_modification ${virtiofsd_script_dir})-$(uname -m)"
}