From 58c48966ed063594b339b40fd2f04bdfb94e31c6 Mon Sep 17 00:00:00 2001 From: Alexander Mikhalitsyn Date: Tue, 7 Nov 2023 14:08:52 +0100 Subject: [PATCH] snapcraft: drop edk2 2MB image https://github.com/canonical/lxd/pull/12515 Signed-off-by: Alexander Mikhalitsyn --- snapcraft.yaml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/snapcraft.yaml b/snapcraft.yaml index 7902cbf3a..f6e1721ed 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -409,14 +409,6 @@ parts: "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.4MB.fd" \ -DFD_SIZE_4MB - # Compatibility firmware (2MB, no CSM) - build_edk2 \ - "${CRAFT_PART_INSTALL}/share/qemu/OVMF_CODE.2MB.fd" \ - "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.2MB.fd" \ - -DFD_SIZE_2MB - ln -s OVMF_CODE.2MB.fd "${CRAFT_PART_INSTALL}/share/qemu/OVMF_CODE.fd" - ln -s OVMF_VARS.2MB.fd "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.fd" - # Legacy firmware (4MB, CSM) if [ "$(uname -m)" = "x86_64" ]; then build_edk2 \ @@ -958,16 +950,6 @@ parts: -V "${CRAFT_STAGE}/share/qemu/OVMF_VARS.4MB.fd" \ -C "$(cat ubuntu-sb.crt)" \ -o "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.4MB.ms.fd" - - # 2MB variant - ./edk2-vars-generator -f "${FIRMWARE}" \ - -e ../../edk2/build/Build/*/*/*/EnrollDefaultKeys.efi \ - -s ../../edk2/build/Build/*/*/*/Shell.efi \ - -c "${CRAFT_STAGE}/share/qemu/OVMF_CODE.2MB.fd" \ - -V "${CRAFT_STAGE}/share/qemu/OVMF_VARS.2MB.fd" \ - -C "$(cat ubuntu-sb.crt)" \ - -o "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.2MB.ms.fd" - ln -s OVMF_VARS.2MB.ms.fd "${CRAFT_PART_INSTALL}/share/qemu/OVMF_VARS.ms.fd" prime: - share/qemu/*