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

packaging: add CC's sev-initrd target

Browse Source 
Adds a make target, and a function in the kata-deploy-binaries script.
In the spirit of avoiding code duplication, making the cc-initrd function more generic.

Fixes: #5118

Signed-Off-By: Alex Carter <alex.carter@ibm.com>
This commit is contained in:
Alex Carter 2022-08-30 20:12:02 +00:00 committed by Alex
parent 9b49a6ddc6
commit fa11294b0f
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,8 @@ cc: cc-cloud-hypervisor-tarball \
cc-tdx-qemu-tarball \
cc-tdx-td-shim-tarball \
cc-tdx-tdvf-tarball \
cc-sev-ovmf-tarball
cc-sev-ovmf-tarball \
cc-sev-rootfs-initrd-tarball
cc-cloud-hypervisor-tarball:
${MAKE} $@-build
@ -103,6 +104,9 @@ cc-qemu-tarball:
cc-rootfs-image-tarball:
${MAKE} $@-build
cc-sev-rootfs-initrd-tarball: cc-sev-kernel-tarball
${MAKE} $@-build
cc-shim-v2-tarball:
${MAKE} $@-build

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

@ -90,6 +90,7 @@ options:
cc-qemu
cc-tdx-qemu
cc-rootfs-image
cc-sev-initrd-image
cc-shimv2
cc-virtiofsd
cc-sev-ovmf
@ -113,13 +114,20 @@ install_cc_clh() {
#Install cc capable guest image
install_cc_image() {
export AA_KBC="${1:-offline_fs_kbc}"
image_type="${2:-image}"
export SKOPEO="${SKOPEO:-yes}"
export UMOCI=yes
export AA_KBC="offline_fs_kbc"
export KATA_BUILD_CC=yes
info "Create CC image configured with SKOPEO=${SKOPEO} UMOCI=${UMOCI} AA_KBC=${AA_KBC}"
"${rootfs_builder}" --imagetype=image --prefix="${cc_prefix}" --destdir="${destdir}"
"${rootfs_builder}" --imagetype="${image_type}" --prefix="${cc_prefix}" --destdir="${destdir}"
}
install_cc_sev_image() {
AA_KBC="offline_sev_kbc"
image_type="initrd"
install_cc_image "${AA_KBC}" "${image_type}"
}
#Install CC kernel asset
@ -316,6 +324,7 @@ handle_build() {
install_cc_image
install_cc_shimv2
install_cc_virtiofsd
install_cc_sev_image
;;
cc-cloud-hypervisor) install_cc_clh ;;
@ -326,6 +335,8 @@ handle_build() {
cc-rootfs-image) install_cc_image ;;
cc-sev-initrd-image) install_cc_sev_image ;;
cc-shim-v2) install_cc_shimv2 ;;
cc-virtiofsd) install_cc_virtiofsd ;;