From 27ce3eef1236f6cf4cac90e6b3d78bfc35880c74 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Wed, 5 Feb 2025 15:10:32 +0100 Subject: [PATCH] local-build: Do not use measured rootfs on s390x IBM SE ensures to make initrd measured by genprotimg and verified by ultravisor. Let's not build the measured rootf on s390x. Signed-off-by: Hyounggyu Choi --- .../local-build/kata-deploy-binaries.sh | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh index ece0911c31..0cafce3f70 100755 --- a/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh +++ b/tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh @@ -389,7 +389,11 @@ install_image() { #Install guest image for confidential guests install_image_confidential() { - export MEASURED_ROOTFS=yes + if [ "${ARCH}" == "s390x" ]; then + export MEASURED_ROOTFS=no + else + export MEASURED_ROOTFS=yes + fi export PULL_TYPE=default install_image "confidential" } @@ -467,7 +471,11 @@ install_initrd() { #Install guest initrd for confidential guests install_initrd_confidential() { - export MEASURED_ROOTFS=yes + if [ "${ARCH}" == "s390x" ]; then + export MEASURED_ROOTFS=no + else + export MEASURED_ROOTFS=yes + fi export PULL_TYPE=default install_initrd "confidential" } @@ -610,7 +618,11 @@ install_kernel() { } install_kernel_confidential() { - export MEASURED_ROOTFS=yes + if [ "${ARCH}" == "s390x" ]; then + export MEASURED_ROOTFS=no + else + export MEASURED_ROOTFS=yes + fi install_kernel_helper \ "assets.kernel.confidential" \ @@ -850,6 +862,9 @@ install_shimv2() { export GO_VERSION export RUST_VERSION export MEASURED_ROOTFS + if [ "${ARCH}" == "s390x" ]; then + export MEASURED_ROOTFS=no + fi DESTDIR="${destdir}" PREFIX="${prefix}" "${shimv2_builder}" }