From 299cb9e0b3ed9fc5add6645b365ba67b7f06e211 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Mon, 7 Aug 2023 10:16:16 -0500 Subject: [PATCH] arm/edk2: move 202211 recipe to meta-arm-bsp 202211 is only used in meta-arm-bsp, and all other users should be using the latest version. Move it there until n1sdp can be updated to the latest. Signed-off-by: Jon Mason --- .../recipes-bsp/uefi/edk2-firmware_202211.bb | 2 +- meta-arm/recipes-bsp/uefi/edk2-firmware.inc | 1 - .../{edk2-firmware_%.bbappend => edk2-firmware_2023%.bbappend} | 0 meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb | 2 ++ 4 files changed, 3 insertions(+), 2 deletions(-) rename {meta-arm => meta-arm-bsp}/recipes-bsp/uefi/edk2-firmware_202211.bb (76%) rename meta-arm/recipes-bsp/uefi/{edk2-firmware_%.bbappend => edk2-firmware_2023%.bbappend} (100%) diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202211.bb b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202211.bb similarity index 76% rename from meta-arm/recipes-bsp/uefi/edk2-firmware_202211.bb rename to meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202211.bb index 386bed4b..378f5854 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202211.bb +++ b/meta-arm-bsp/recipes-bsp/uefi/edk2-firmware_202211.bb @@ -1,4 +1,4 @@ SRCREV_edk2 ?= "fff6d81270b57ee786ea18ad74f43149b9f03494" SRCREV_edk2-platforms ?= "982212662c71b6c734b7578526071d6b78da3bcc" -require edk2-firmware.inc +require recipes-bsp/uefi/edk2-firmware.inc diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc index 4b9eda39..20eea36b 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware.inc +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware.inc @@ -18,7 +18,6 @@ SRCBRANCH_edk2_platforms = "master" SRC_URI = "\ ${SRC_URI_EDK2};branch=${SRCBRANCH_edk2_platforms};name=edk2;destsuffix=edk2 \ ${SRC_URI_EDK2_PLATFORMS};branch=${SRCBRANCH_edk2};name=edk2-platforms;destsuffix=edk2/edk2-platforms \ - file://default.patch;patchdir=edk2-platforms \ " SRCREV_FORMAT = "edk2_edk2-platforms" diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend b/meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend similarity index 100% rename from meta-arm/recipes-bsp/uefi/edk2-firmware_%.bbappend rename to meta-arm/recipes-bsp/uefi/edk2-firmware_2023%.bbappend diff --git a/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb b/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb index fa26c3e3..02738d31 100644 --- a/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb +++ b/meta-arm/recipes-bsp/uefi/edk2-firmware_202302.bb @@ -1,4 +1,6 @@ SRCREV_edk2 ?= "f80f052277c88a67c55e107b550f504eeea947d3" SRCREV_edk2-platforms ?= "65e001a7f2abedf7799cfb36b057326c1540bd47" +SRC_URI:append = " file://default.patch;patchdir=edk2-platforms" + require edk2-firmware.inc