github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-22 17:59:31 +00:00
Code Issues Projects Releases Wiki Activity

kata-deloy-binaries: Get rid of cc_prefix

Browse Source 
We'll be using prefix (/opt/kata) from now on, as it simplifies things
on our side.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2023-07-21 00:00:41 +02:00
parent 4d0b319a8b
commit 20a523f81b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,8 +37,6 @@ readonly nydus_builder="${static_build_dir}/nydus/build.sh"
readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh" readonly rootfs_builder="${repo_root_dir}/tools/packaging/guest-image/build_image.sh"
readonly se_image_builder="${repo_root_dir}/tools/packaging/guest-image/build_se_image.sh" readonly se_image_builder="${repo_root_dir}/tools/packaging/guest-image/build_se_image.sh"
readonly cc_prefix="/opt/confidential-containers"
source "${script_dir}/../../scripts/lib.sh" source "${script_dir}/../../scripts/lib.sh"
readonly jenkins_url="http://jenkins.katacontainers.io" readonly jenkins_url="http://jenkins.katacontainers.io"
@ -273,7 +271,7 @@ install_cc_image() {
info "Create CC image configured with AA_KBC=${AA_KBC}" info "Create CC image configured with AA_KBC=${AA_KBC}"
"${rootfs_builder}" \ "${rootfs_builder}" \
--imagetype="${image_type}" \ --imagetype="${image_type}" \
--prefix="${cc_prefix}" \ --prefix="${prefix}" \
--destdir="${destdir}" \ --destdir="${destdir}" \
--image_initrd_suffix="${image_initrd_suffix}" \ --image_initrd_suffix="${image_initrd_suffix}" \
--root_hash_suffix="${root_hash_suffix}" --root_hash_suffix="${root_hash_suffix}"
@ -337,7 +335,7 @@ install_cc_shimv2() {
fi 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="${prefix}" EXTRA_OPTS="${extra_opts}" "${shimv2_builder}"
} }
install_cc_tdx_td_shim() { install_cc_tdx_td_shim() {
@ -350,7 +348,7 @@ install_cc_tdx_td_shim() {
"${final_tarball_path}" \ "${final_tarball_path}" \
&& return 0 && return 0
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${td_shim_builder}" DESTDIR="${destdir}" PREFIX="${prefix}" "${td_shim_builder}"
tar xvf "${builddir}/td-shim.tar.gz" -C "${destdir}" tar xvf "${builddir}/td-shim.tar.gz" -C "${destdir}"
} }
@ -456,7 +454,7 @@ install_cached_kernel_tarball_component() {
install_cc_initrd() { install_cc_initrd() {
export AA_KBC="${AA_KBC:-offline_fs_kbc}" export AA_KBC="${AA_KBC:-offline_fs_kbc}"
info "Create CC initrd configured with AA_KBC=${AA_KBC}" info "Create CC initrd configured with AA_KBC=${AA_KBC}"
"${rootfs_builder}" --imagetype=initrd --prefix="${cc_prefix}" --destdir="${destdir}" "${rootfs_builder}" --imagetype=initrd --prefix="${prefix}" --destdir="${destdir}"
} }
#Install kernel asset #Install kernel asset