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

packaging: Reorganise TDX targets

Browse Source 
Let's simply add the tdx targets after the CC ones.

Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
Fabiano Fidêncio 2022-08-03 13:46:19 +02:00
parent 554dff20c3
commit 04be5521d0
2 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
tools/packaging/kata-deploy/local-build/Makefile
View File

@ -85,21 +85,12 @@ cc: cc-cloud-hypervisor-tarball \
cc-cloud-hypervisor-tarball: cc-cloud-hypervisor-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-tdx-cloud-hypervisor-tarball:
${MAKE} $@-build
cc-kernel-tarball: cc-kernel-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-tdx-kernel-tarball:
${MAKE} $@-build
cc-qemu-tarball: cc-qemu-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-tdx-qemu-tarball:
${MAKE} $@-build
cc-rootfs-image-tarball: cc-rootfs-image-tarball:
${MAKE} $@-build ${MAKE} $@-build
@ -108,3 +99,13 @@ cc-shim-v2-tarball:
cc-virtiofsd-tarball: cc-virtiofsd-tarball:
${MAKE} $@-build ${MAKE} $@-build
cc-tdx-cloud-hypervisor-tarball:
${MAKE} $@-build
cc-tdx-kernel-tarball:
${MAKE} $@-build
cc-tdx-qemu-tarball:
${MAKE} $@-build

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

@ -108,11 +108,6 @@ install_cc_clh() {
sudo install -D --owner root --group root --mode 0744 cloud-hypervisor/cloud-hypervisor "${destdir}/${cc_prefix}/bin/cloud-hypervisor" sudo install -D --owner root --group root --mode 0744 cloud-hypervisor/cloud-hypervisor "${destdir}/${cc_prefix}/bin/cloud-hypervisor"
} }
# Install static CC cloud-hypervisor asset
install_tdx_cc_clh() {
install_cc_clh
}
#Install cc capable guest image #Install cc capable guest image
install_cc_image() { install_cc_image() {
info "Create CC image" info "Create CC image"
@ -123,45 +118,12 @@ install_cc_image() {
"${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}" "${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}"
} }
#Install CC kernel assert, with TEE support
install_cc_tee_kernel() {
tee="${1}"
[ "${tee}" != "tdx" ] && die "Non supported TEE"
export kernel_version="$(yq r $versions_yaml assets.kernel.${tee}.tag)"
export kernel_url="$(yq r $versions_yaml assets.kernel.${tee}.url)"
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -x "${tee}" -v "${kernel_version}" -u "${kernel_url}"
}
#Install CC kernel assert for Intel TDX
install_cc_tdx_kernel() {
install_cc_tee_kernel "tdx"
}
#Install CC kernel asset #Install CC kernel asset
install_cc_kernel() { install_cc_kernel() {
export kernel_version="$(yq r $versions_yaml assets.kernel.version)" export kernel_version="$(yq r $versions_yaml assets.kernel.version)"
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -f -v "${kernel_version}" DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -f -v "${kernel_version}"
} }
install_cc_tee_qemu() {
tee="${1}"
[ "${tee}" != "tdx" ] && die "Non supported TEE"
export qemu_repo="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.url)"
export qemu_version="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.tag)"
export tee="${tee}"
"${qemu_cc_builder}"
tar xvf "${builddir}/kata-static-${tee}-qemu-cc.tar.gz" -C "${destdir}"
}
install_cc_tdx_qemu() {
install_cc_tee_qemu "tdx"
}
# Install static CC qemu asset # Install static CC qemu asset
install_cc_qemu() { install_cc_qemu() {
info "build static CC qemu" info "build static CC qemu"
@ -188,6 +150,43 @@ install_cc_virtiofsd() {
sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd" sudo install -D --owner root --group root --mode 0744 virtiofsd/virtiofsd "${destdir}/${cc_prefix}/libexec/virtiofsd"
} }
# Install static CC cloud-hypervisor asset
install_tdx_cc_clh() {
install_cc_clh
}
#Install CC kernel assert, with TEE support
install_cc_tee_kernel() {
tee="${1}"
[ "${tee}" != "tdx" ] && die "Non supported TEE"
export kernel_version="$(yq r $versions_yaml assets.kernel.${tee}.tag)"
export kernel_url="$(yq r $versions_yaml assets.kernel.${tee}.url)"
DESTDIR="${destdir}" PREFIX="${cc_prefix}" "${kernel_builder}" -x "${tee}" -v "${kernel_version}" -u "${kernel_url}"
}
#Install CC kernel assert for Intel TDX
install_cc_tdx_kernel() {
install_cc_tee_kernel "tdx"
}
install_cc_tee_qemu() {
tee="${1}"
[ "${tee}" != "tdx" ] && die "Non supported TEE"
export qemu_repo="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.url)"
export qemu_version="$(yq r $versions_yaml assets.hypervisor.qemu.${tee}.tag)"
export tee="${tee}"
"${qemu_cc_builder}"
tar xvf "${builddir}/kata-static-${tee}-qemu-cc.tar.gz" -C "${destdir}"
}
install_cc_tdx_qemu() {
install_cc_tee_qemu "tdx"
}
#Install guest image #Install guest image
install_image() { install_image() {
info "Create image" info "Create image"
@ -296,22 +295,22 @@ handle_build() {
cc-cloud-hypervisor) install_cc_clh ;; cc-cloud-hypervisor) install_cc_clh ;;
cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;;
cc-kernel) install_cc_kernel ;; cc-kernel) install_cc_kernel ;;
cc-tdx-kernel) install_cc_tdx_kernel ;;
cc-qemu) install_cc_qemu ;; cc-qemu) install_cc_qemu ;;
cc-tdx-qemu) install_cc_tdx_qemu ;;
cc-rootfs-image) install_cc_image ;; cc-rootfs-image) install_cc_image ;;
cc-shim-v2) install_cc_shimv2 ;; cc-shim-v2) install_cc_shimv2 ;;
cc-virtiofsd) install_cc_virtiofsd ;; cc-virtiofsd) install_cc_virtiofsd ;;
cc-tdx-cloud-hypervisor) install_tdx_cc_clh ;;
cc-tdx-kernel) install_cc_tdx_kernel ;;
cc-tdx-qemu) install_cc_tdx_qemu ;;
cloud-hypervisor) install_clh ;; cloud-hypervisor) install_clh ;;
firecracker) install_firecracker ;; firecracker) install_firecracker ;;