diff --git a/patches/edk2-0006-disable-EFI-memory-attributes-protocol.patch b/patches/edk2-0006-disable-EFI-memory-attributes-protocol.patch new file mode 100644 index 000000000..b666ed0ca --- /dev/null +++ b/patches/edk2-0006-disable-EFI-memory-attributes-protocol.patch @@ -0,0 +1,30 @@ +From cb5e0080ffd3f522f83b8e9273eac10e132ce7c7 Mon Sep 17 00:00:00 2001 +From: Alexander Mikhalitsyn +Date: Thu, 7 Sep 2023 09:07:08 +0200 +Subject: [PATCH] edk2: disable EFI memory attributes protocol + +https://github.com/canonical/lxd/issues/12211 + +Signed-off-by: Alexander Mikhalitsyn +--- + ArmPkg/Drivers/CpuDxe/CpuDxe.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.c b/ArmPkg/Drivers/CpuDxe/CpuDxe.c +index d04958e79e..c01d571379 100644 +--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.c ++++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.c +@@ -244,8 +244,8 @@ CpuDxeInitialize ( + &mCpuHandle, + &gEfiCpuArchProtocolGuid, + &mCpu, +- &gEfiMemoryAttributeProtocolGuid, +- &mMemoryAttribute, ++// &gEfiMemoryAttributeProtocolGuid, ++// &mMemoryAttribute, + NULL + ); + +-- +2.34.1 + diff --git a/snapcraft.yaml b/snapcraft.yaml index 1b922e0e6..47087a4c2 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -322,6 +322,7 @@ parts: patch -p1 < "${CRAFT_PROJECT_DIR}/patches/edk2-0003-boot-delay.patch" patch -p1 < "${CRAFT_PROJECT_DIR}/patches/edk2-0004-gcc-errors.patch" patch --binary -p1 < "${CRAFT_PROJECT_DIR}/patches/edk2-0005-disable-dynamic-mmio-winsize.patch" + patch --binary -p1 < "${CRAFT_PROJECT_DIR}/patches/edk2-0006-disable-EFI-memory-attributes-protocol.patch" # Setup CSM blob if [ "$(uname -m)" = "x86_64" ]; then