From 14b2b0b7cd1bc6e3c57a1939b6cd8132a78f394a Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 17 Jun 2021 17:28:38 +0100 Subject: [PATCH] arm/edk2-firmware: apply VLA fix to all edk2 builds sbsa-acs was fixed to solve the VLA compiler error with GCC 11, but the problem is in EDK2 and not specific to sbsa-acs. Apply the patch in edk2-firmware.inc so that all recipes get the fix. Change-Id: I56b07fa0610d47bd89c1ce37cfac1205a90a4083 Signed-off-by: Ross Burton --- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 1 + .../{sbsa-acs => files}/0001-Fix-VLA-parameter-warning.patch | 0 meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) rename meta-arm/recipes-bsp/uefi/{sbsa-acs => files}/0001-Fix-VLA-parameter-warning.patch (100%) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 23342015..c5ab48c1 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -18,6 +18,7 @@ EDK2_PLATFORMS_SRC_URI = "git://github.com/tianocore/edk2-platforms.git" SRC_URI = "\ ${EDK2_SRC_URI};name=edk2;destsuffix=edk2;nobranch=1 \ ${EDK2_PLATFORMS_SRC_URI};name=edk2-platforms;destsuffix=edk2/edk2-platforms;nobranch=1 \ + file://0001-Fix-VLA-parameter-warning.patch \ " SRCREV_FORMAT = "edk2_edk2-platforms" diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-VLA-parameter-warning.patch b/meta-arm/recipes-bsp/uefi/files/0001-Fix-VLA-parameter-warning.patch similarity index 100% rename from meta-arm/recipes-bsp/uefi/sbsa-acs/0001-Fix-VLA-parameter-warning.patch rename to meta-arm/recipes-bsp/uefi/files/0001-Fix-VLA-parameter-warning.patch diff --git a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb index 173cfa7e..c0d8e914 100644 --- a/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb +++ b/meta-arm/recipes-bsp/uefi/sbsa-acs_3.0.bb @@ -10,7 +10,6 @@ SRC_URI += "git://github.com/ARM-software/sbsa-acs;destsuffix=edk2/ShellPkg/Appl file://shell.patch \ file://0001-pal_uefi-Fix-enum-conversion.patch \ file://use_bfd_linker.patch \ - file://0001-Fix-VLA-parameter-warning.patch \ " SRCREV_acs = "1b3a37214fe6809e07e471f79d1ef856461bc803"