uefi: Bump OVMF to edk2-stable202208 and apply build fix patch.

This update addresses the issue where OVMF settings were not being saved into a file by upgrading to the `edk2-stable202208` version. The new version includes important bug fixes that resolve the aforementioned problem. To successfully perform the version bump, an additional patch was necessary to fix a build failure. Specifically, the `QemuFwCfgLib` library was missing in the `XenPlatformPei` module, which has been corrected by adding the appropriate include statement. Signed-off-by: Nikolay Martyanov <[email protected]>
lf-edge · Sep 18, 2024 · 7177700 · 7177700
1 parent afd5710
commit 7177700
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/pkg/uefi/Dockerfile b/pkg/uefi/Dockerfile
@@ -29,8 +29,8 @@ COPY rpi /rpi
 
 FROM build AS build-amd64-versions
 
-ENV EDK_VERSION edk2-stable202005
-ENV EDK_COMMIT ca407c7246bf405da6d9b1b9d93e5e7f17b4b1f9
+ENV EDK_VERSION edk2-stable202208
+ENV EDK_COMMIT ba0e0e4c6a174b71b18ccd6e47319cc45878893c
 
 FROM build-${TARGETARCH}-versions AS build-edk2
 

diff --git a/...patches/edk2-stable202208/0007-OvmfPkg-XenPlatformPei-Fix-missing-QemuFwCfgLib-incl.patch b/...patches/edk2-stable202208/0007-OvmfPkg-XenPlatformPei-Fix-missing-QemuFwCfgLib-incl.patch
@@ -0,0 +1,28 @@
+From d35bf801c8a7b7737e5a868a1bac5cd380c63866 Mon Sep 17 00:00:00 2001
+From: Nikolay Martyanov <[email protected]>
+Date: Wed, 18 Sep 2024 13:12:53 +0200
+Subject: [PATCH] OvmfPkg/XenPlatformPei: Fix missing QemuFwCfgLib include.
+
+Added missing include in the XenPlatformPei module to resolve build
+failures related to missing references from QemuFwCfgLib.
+
+Signed-off-by: Nikolay Martyanov <[email protected]>
+---
+ OvmfPkg/XenPlatformPei/Platform.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/OvmfPkg/XenPlatformPei/Platform.c b/OvmfPkg/XenPlatformPei/Platform.c
+index 8a8631b3d3..76262897e5 100644
+--- a/OvmfPkg/XenPlatformPei/Platform.c
++++ b/OvmfPkg/XenPlatformPei/Platform.c
+@@ -27,6 +27,7 @@
+ #include <Library/PeimEntryPoint.h>
+ #include <Library/PeiServicesLib.h>
+ #include <Library/QemuFwCfgS3Lib.h>
++#include <Library/QemuFwCfgLib.h>
+ #include <Library/ResourcePublicationLib.h>
+ #include <Guid/MemoryTypeInformation.h>
+ #include <Ppi/MasterBootMode.h>
+-- 
+2.46.0
+