From 813b15cf066b69075f4970489c5116c2abd411e8 Mon Sep 17 00:00:00 2001 From: Li Zhou Date: Thu, 22 Dec 2022 15:17:49 +0800 Subject: [PATCH] grub-efi: install grub-efi pkgs Install grub-efi-amd64 pkg into iso image. The grub-efi related packages have been divided from grub2 build. They are built by grub-efi and can be installed now, because we don't want to use the grubx64.efi image from lat sdk sysroots any more. Test plan: The tests are done with all the changes which involve tools/integ/root repo and lat-sdk.sh and signing tools on signing server. - PASS: Follow below build process to build unsigned image and build successfully: build-pkgs build-image - PASS: Follow below build process to build signed image and build successfully: Prepare keys on dockers and signing server to setup access to signing server without password build-pkgs export SIGNING_SERVER="user@signing_server_ip" /sign-secure-boot_debian build-image The is: /localdisk/designer/${USER}/stx/cgcs-root/build-tools/ - PASS: Do AIO-DX installation successfully for both unsigned image on secure boot disabled lab and signed image on secure boot enabled lab. - PASS: Failure path tests include: [NG]unsigned image on secure boot enabled [NG]image signed with wrong key on secure boot enabled [OK]signed image on secure boot disabled NG: fail to boot; OK: succeed to boot. Depends-On: https://review.opendev.org/c/starlingx/tools/+/868918 Story: 2009221 Task: 47097 Signed-off-by: Li Zhou Change-Id: I73f857ded5c83810002d6972f9d7683e9e258c6d --- debian_iso_image.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/debian_iso_image.inc b/debian_iso_image.inc index d61f49f55..0a39cfc14 100644 --- a/debian_iso_image.inc +++ b/debian_iso_image.inc @@ -108,19 +108,18 @@ libfacter3.14.12 #gpu-operator gpu-operator +#grub-efi +#grub-efi-amd64-bin # not used +#grub-efi-amd64-dbg # not used +#grub-efi-amd64-signed-template # not used +grub-efi-amd64 +#grub-efi # not used + #grub2 grub-common #grub-coreboot-bin # not used #grub-coreboot-dbg # not used #grub-coreboot # not used -#grub-efi-amd64-bin # not used -#grub-efi-amd64-dbg # not used -#grub-efi-amd64-signed-template # not used -#grub-efi-amd64 # not used -#grub-efi-ia32-bin # not used -#grub-efi-ia32-dbg # not used -#grub-efi-ia32 # not used -#grub-efi # not used #grub-emu-dbg # not used #grub-emu # not used #grub-firmware-qemu # not used