github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 18:21:27 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7351 from fitzthum/fix-offload

Browse Source 
local-build: always use DEFSERVICEOFFLOAD for CoCo
This commit is contained in:
Steve Horsman 2023-07-17 11:07:24 +01:00 committed by GitHub
commit 6f2c95a2ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@ -392,8 +392,8 @@ install_cc_shimv2() {
export RUST_VERSION export RUST_VERSION
export REMOVE_VMM_CONFIGS="acrn fc" export REMOVE_VMM_CONFIGS="acrn fc"
if [ "${MEASURED_ROOTFS}" == "yes" ]; then
extra_opts="DEFSERVICEOFFLOAD=true" extra_opts="DEFSERVICEOFFLOAD=true"
if [ "${MEASURED_ROOTFS}" == "yes" ]; then
if [ -f "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt" ]; then if [ -f "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt" ]; then
root_hash=$(sudo sed -e 's/Root hash:\s*//g;t;d' "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt") root_hash=$(sudo sed -e 's/Root hash:\s*//g;t;d' "${repo_root_dir}/tools/osbuilder/root_hash_vanilla.txt")
root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}" root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}"
@ -405,12 +405,9 @@ install_cc_shimv2() {
root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}" root_measure_config="cc_rootfs_verity.scheme=dm-verity cc_rootfs_verity.hash=${root_hash}"
extra_opts+=" ROOTMEASURECONFIGTDX=\"${root_measure_config}\"" extra_opts+=" ROOTMEASURECONFIGTDX=\"${root_measure_config}\""
fi fi
fi
info "extra_opts: ${extra_opts}" info "extra_opts: ${extra_opts}"
DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}" DESTDIR="${destdir}" PREFIX="${cc_prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}"
else
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${shimv2_builder}"
fi
} }
# Install static CC virtiofsd asset # Install static CC virtiofsd asset