github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 23:07:55 +00:00
Code Issues Projects Releases Wiki Activity

packaging: Add rootfs-image-tdx-tarball target

Browse Source 
Add rootfs-image-tdx target:
./tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh --build=rootfs-image-tdx
./opt/kata/share/kata-containers/kata-containers-tdx.img
./opt/kata/share/kata-containers/kata-ubuntu-latest-tdx.image

Fixes: #6674

Signed-off-by: Wang, Arron <arron.wang@intel.com>
This commit is contained in:
Wang, Arron
2023-05-21 16:50:00 +08:00
committed by Fabiano Fidêncio
parent f62b2670c0
commit f6afae9c73
4 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,6 +42,7 @@ all: serial-targets \
serial-targets:
${MAKE} -f $(MK_PATH) -j 1 V= \
rootfs-image-tarball \
rootfs-image-tdx-tarball \
rootfs-initrd-sev-tarball \
rootfs-initrd-tarball \
cloud-hypervisor-tarball
@@ -100,6 +101,9 @@ qemu-tdx-experimental-tarball:
rootfs-image-tarball:
${MAKE} $@-build
rootfs-image-tdx-tarball: kernel-tdx-experimental-tarball
${MAKE} $@-build
rootfs-initrd-sev-tarball: kernel-sev-tarball
${MAKE} $@-build

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

@@ -95,6 +95,7 @@ options:
qemu-snp-experimental
qemu-tdx-experimental
rootfs-image
rootfs-image-tdx
rootfs-initrd
rootfs-initrd-sev
shim-v2
@@ -135,8 +136,10 @@ install_cached_tarball_component() {
#Install guest image
install_image() {
local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-image-$(uname -m)/${cached_artifacts_path}"
local component="rootfs-image"
local image_type="${1:-"image"}"
local initrd_suffix="${2:-""}"
local jenkins="${jenkins_url}/job/kata-containers-main-rootfs-${image_type}-$(uname -m)/${cached_artifacts_path}"
local component="rootfs-${image_type}"
local osbuilder_last_commit="$(get_last_modification "${repo_root_dir}/tools/osbuilder")"
local guest_image_last_commit="$(get_last_modification "${repo_root_dir}/tools/packaging/guest-image")"
@@ -156,7 +159,12 @@ install_image() {
&& return 0
info "Create image"
"${rootfs_builder}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}"
"${rootfs_builder}" --imagetype=image --prefix="${prefix}" --destdir="${destdir}" --image_initrd_suffix="${initrd_suffix}"
}
#Install guest image for tdx
install_image_tdx() {
install_image "image-tdx" "tdx"
}
#Install guest initrd
@@ -310,6 +318,8 @@ install_kernel_experimental() {
install_kernel_tdx_experimental() {
local kernel_url="$(get_from_kata_deps assets.kernel-tdx-experimental.url)"
export MEASURED_ROOTFS=yes
install_kernel_helper \
"assets.kernel-tdx-experimental.version" \
"kernel-tdx-experimental" \
@@ -600,6 +610,8 @@ handle_build() {
rootfs-image) install_image ;;
rootfs-image-tdx) install_image_tdx ;;
rootfs-initrd) install_initrd ;;
rootfs-initrd-sev) install_initrd_sev ;;