aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-01-25 09:14:29 +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: #6558
Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman
2023-04-27 09:42:44 +01:00
parent 796c8d5015 509bc8b6c8
commit dbe1fd9436
242 changed files with 10099 additions and 2670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/packaging/scripts/configure-hypervisor.sh
View File

@@ -242,9 +242,12 @@ generate_qemu_options() {
# Disable graphical network access
qemu_options+=(size:--disable-vnc)
qemu_options+=(size:--disable-vnc-jpeg)
if ! gt_eq "${qemu_version}" "7.1.0" ; then
if ! gt_eq "${qemu_version}" "7.0.50" ; then
qemu_options+=(size:--disable-vnc-png)
else
qemu_options+=(size:--disable-png)
fi
qemu_options+=(size:--disable-vnc-sasl)
# Disable PAM authentication: it's a feature used together with VNC access
@@ -358,7 +361,7 @@ generate_qemu_options() {
qemu_options+=(size:--disable-vde)
# Don't build other options which can't be depent on build server.
if ! gt_eq "${qemu_version}" "7.1.0" ; then
if ! gt_eq "${qemu_version}" "7.0.50" ; then
qemu_options+=(size:--disable-xfsctl)
qemu_options+=(size:--disable-libxml2)
fi

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

@@ -222,6 +222,11 @@ get_td_shim_image_name() {
echo "${CC_BUILDER_REGISTRY}:td-shim-$(get_from_kata_deps "externals.td-shim.toolchain")-$(get_last_modification ${td_shim_script_dir})-$(uname -m)"
}
get_ovmf_image_name() {
ovmf_script_dir="${repo_root_dir}/tools/packaging/static-build/ovmf"
echo "${BUILDER_REGISTRY}:ovmf-$(get_last_modification ${ovmf_script_dir})-$(uname -m)"
}
get_virtiofsd_image_name() {
ARCH=$(uname -m)
case ${ARCH} in