From 47be5c088018a7747a94c4ea7884f187a81e9dbe Mon Sep 17 00:00:00 2001 From: hanliyang Date: Mon, 17 Mar 2025 10:40:37 +0800 Subject: [PATCH] Add missing module CsvDxe in OvmfPkg/AmdSev/AmdSevX64.fdf Signed-off-by: hanliyang --- ...Pkg-AmdSev-Add-missing-module-CsvDxe.patch | 30 +++++++++++++++++++ edk2.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 1004-OvmfPkg-AmdSev-Add-missing-module-CsvDxe.patch diff --git a/1004-OvmfPkg-AmdSev-Add-missing-module-CsvDxe.patch b/1004-OvmfPkg-AmdSev-Add-missing-module-CsvDxe.patch new file mode 100644 index 0000000..5760810 --- /dev/null +++ b/1004-OvmfPkg-AmdSev-Add-missing-module-CsvDxe.patch @@ -0,0 +1,30 @@ +From f5723c0926132f2b13858e9755c88ee53e6aefc2 Mon Sep 17 00:00:00 2001 +From: hanliyang +Date: Mon, 17 Mar 2025 10:25:00 +0800 +Subject: [PATCH] OvmfPkg/AmdSev: Add missing module CsvDxe + +In order to support running OVMF.fd under Hygon Confidential Computing +guest, we should include the CsvDxe module in +OvmfPkg/AmdSev/AmdSevX64.{dsc,fdf}. We have included CsvDxe module in +.../AmdSevX64.dsc but not in .../AmdSevX64.fdf, and we fix it here. + +Signed-off-by: hanliyang +--- + OvmfPkg/AmdSev/AmdSevX64.fdf | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf +index 86b9bc1..e0e9d49 100644 +--- a/OvmfPkg/AmdSev/AmdSevX64.fdf ++++ b/OvmfPkg/AmdSev/AmdSevX64.fdf +@@ -314,6 +314,7 @@ INF OvmfPkg/VirtioGpuDxe/VirtioGpu.inf + INF OvmfPkg/PlatformDxe/Platform.inf + INF OvmfPkg/AmdSevDxe/AmdSevDxe.inf + INF OvmfPkg/IoMmuDxe/IoMmuDxe.inf ++INF OvmfPkg/CsvDxe/CsvDxe.inf + + + # +-- +2.25.1 + diff --git a/edk2.spec b/edk2.spec index 2910aab..f158043 100644 --- a/edk2.spec +++ b/edk2.spec @@ -1,4 +1,4 @@ -%define anolis_release 9 +%define anolis_release 10 %undefine _auto_set_build_flags ExclusiveArch: x86_64 aarch64 loongarch64 @@ -94,6 +94,7 @@ Patch1001: 1001-Bugfix-for-CVE-2023-45237.patch Patch1002: 1002-Bugfix-for-CVE-2023-45236.patch Patch1003: 1003-OvmfPkg-AmdSev-Support-full-disk-encryption-based-on.patch +Patch1004: 1004-OvmfPkg-AmdSev-Add-missing-module-CsvDxe.patch BuildRequires: python3-devel BuildRequires: libuuid-devel @@ -499,6 +500,9 @@ install -m 0644 \ %changelog +* Mon Mar 17 2025 hanliyang - 202402-10 +- Add missing module CsvDxe + * Wed Jan 01 2025 hanliyang - 202402-9 - Support build OVMF.fd based on full-disk encryption -- Gitee