From b02cc14367890661ca047ffe8c5d86a3e6bac95d Mon Sep 17 00:00:00 2001 From: Sean Rhodes Date: Tue, 2 Aug 2022 07:56:54 +0100 Subject: [PATCH] payloads/edk2: Move the restoration of the logo Logo.bmp is overwritten with a custom one from coreboot. This needs to be restored before the branch is updated otherwise git will report that the repository is dirty. Move this to the update recipe so that will always be done for any recipe that needs to update the branch. Signed-off-by: Sean Rhodes Change-Id: I85bf753a47d9e70d6555dec9a539e8ed7395bead Reviewed-on: https://review.coreboot.org/c/coreboot/+/66355 Reviewed-by: Lean Sheng Tan Tested-by: build bot (Jenkins) --- payloads/external/edk2/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/external/edk2/Makefile b/payloads/external/edk2/Makefile index 68e48459a5..a03acbf406 100644 --- a/payloads/external/edk2/Makefile +++ b/payloads/external/edk2/Makefile @@ -106,6 +106,7 @@ update: $(project_dir) git clone $(CONFIG_EDK2_REPOSITORY) $(project_dir); \ fi cd $(project_dir); \ + git checkout MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true; \ echo " Fetching new commits from $(CONFIG_EDK2_REPOSITORY)"; \ git fetch origin 2>/dev/null; \ if ! git rev-parse --verify -q $(CONFIG_EDK2_TAG_OR_REV) >/dev/null; then \ @@ -178,7 +179,6 @@ build: update print logo checktools build $(BUILD_STR); \ mkdir -p $(project_dir)/../output; \ mv $(project_dir)/Build/$(bootloader)*/*/FV/UEFIPAYLOAD.fd $(project_dir)/../output/UEFIPAYLOAD.fd; \ - git checkout MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true clean: test -d $(project_dir) && (cd $(project_dir); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0