From 61dce71cb535775c6595f36faf8496997865843e Mon Sep 17 00:00:00 2001 From: Ryan Roberts Date: Tue, 5 Nov 2024 15:25:21 +0000 Subject: [PATCH] config: Update edk2 revision to workaround "subhook" issue Checking out edk2 has started failing due to one of it's submodule dependencies, https://github.com/Zeex/subhook.git, being removed from GitHub: Cloning into '/data_nvme0n1/ryarob01/shrinkwrap_demo/workspace/edk2/edk2/UnitTestFrameworkPkg/Library/SubhookLib/subhook'... remote: Repository not found. fatal: repository 'https://github.com/Zeex/subhook.git/' not found fatal: clone of 'https://github.com/Zeex/subhook.git' into submodule path '/data_nvme0n1/ryarob01/shrinkwrap_demo/workspace/edk2/edk2/UnitTestFrameworkPkg/Library/SubhookLib/subhook' failed Failed to clone 'UnitTestFrameworkPkg/Library/SubhookLib/subhook'. Retry scheduled This has been resolved in edk2's master branch by linking to a mirror of the project. But that commit is not yet in any stable tag. So for now, let's fix to the SHA of the fix. Once the next stable tag is out, we will need to update again. However, updating to this SHA breaks the build because edk2-platforms is out of date. So let's update it to its latest commit also. But this is broken for RELEASE builds, so we must build DEBUG. A patch will be merged soon to fix RELEASE, so we will update to that once merged. Finally, the downstream branch of edk2 used for the CCA configs (both host and guest) need to be updated. A new branch has been created that cherry-picks the submodule fix. Signed-off-by: Ryan Roberts --- config/cca-3world.yaml | 2 +- config/cca-edk2.yaml | 2 +- config/edk2-base.yaml | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/cca-3world.yaml b/config/cca-3world.yaml index 17239e1..9e4a25b 100644 --- a/config/cca-3world.yaml +++ b/config/cca-3world.yaml @@ -116,7 +116,7 @@ build: repo: edk2: remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git - revision: 2802_arm_cca_rmm-v1.0-eac5 + revision: 2802_arm_cca_rmm-v1.0-eac5-patch1 toolchain: aarch64-none-elf- diff --git a/config/cca-edk2.yaml b/config/cca-edk2.yaml index d26df1c..97d9336 100644 --- a/config/cca-edk2.yaml +++ b/config/cca-edk2.yaml @@ -53,7 +53,7 @@ build: repo: edk2: remote: https://git.gitlab.arm.com/linux-arm/edk2-cca.git - revision: 2802_arm_cca_rmm-v1.0-eac5 + revision: 2802_arm_cca_rmm-v1.0-eac5-patch1 edk2-platforms: remote: https://git.gitlab.arm.com/linux-arm/edk2-platforms-cca.git revision: 2802_arm_cca_rmm-v1.0-eac5 diff --git a/config/edk2-base.yaml b/config/edk2-base.yaml index 08e39f6..f7c9da2 100644 --- a/config/edk2-base.yaml +++ b/config/edk2-base.yaml @@ -12,7 +12,7 @@ build: acpica: repo: remote: https://github.com/acpica/acpica.git - revision: R06_28_23 + revision: R09_27_24 build: - rm -rf ${param:sourcedir}/generate/unix/acpica @@ -26,10 +26,10 @@ build: repo: edk2: remote: https://github.com/tianocore/edk2.git - revision: edk2-stable202311 + revision: 95d8a1c255cfb8e063d679930d08ca6426eb5701 edk2-platforms: remote: https://github.com/tianocore/edk2-platforms.git - revision: 4b07df2e6f3813c6e955197dacb2cdfbe3471caa + revision: 5b5885ef3e30a2896f23afd6df3d2dae8d5e51b3 toolchain: aarch64-none-elf- @@ -46,7 +46,7 @@ build: -a: AARCH64 -t: GCC5 -p: Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc - -b: RELEASE + -b: DEBUG --pcd: PcdShellDefaultDelay=0 ' --pcd': PcdUefiShellDefaultBootEnable=1 @@ -56,4 +56,4 @@ build: - build -n ${param:jobs} -D EDK2_OUT_DIR=${param:builddir} ${param:join_space} artifacts: - EDK2: ${param:builddir}/RELEASE_GCC5/FV/FVP_AARCH64_EFI.fd + EDK2: ${param:builddir}/DEBUG_GCC5/FV/FVP_AARCH64_EFI.fd -- GitLab