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 <sean@starlabs.systems>
Change-Id: I85bf753a47d9e70d6555dec9a539e8ed7395bead
Reviewed-on: https://review.coreboot.org/c/coreboot/+/66355
Reviewed-by: Lean Sheng Tan <sheng.tan@9elements.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Sean Rhodes 2022-08-02 07:56:54 +01:00 committed by Martin Roth
parent 2e8e0601fd
commit b02cc14367
1 changed files with 1 additions and 1 deletions

View File

@ -106,6 +106,7 @@ update: $(project_dir)
git clone $(CONFIG_EDK2_REPOSITORY) $(project_dir); \ git clone $(CONFIG_EDK2_REPOSITORY) $(project_dir); \
fi fi
cd $(project_dir); \ cd $(project_dir); \
git checkout MdeModulePkg/Logo/Logo.bmp > /dev/null 2>&1 || true; \
echo " Fetching new commits from $(CONFIG_EDK2_REPOSITORY)"; \ echo " Fetching new commits from $(CONFIG_EDK2_REPOSITORY)"; \
git fetch origin 2>/dev/null; \ git fetch origin 2>/dev/null; \
if ! git rev-parse --verify -q $(CONFIG_EDK2_TAG_OR_REV) >/dev/null; then \ 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); \ build $(BUILD_STR); \
mkdir -p $(project_dir)/../output; \ mkdir -p $(project_dir)/../output; \
mv $(project_dir)/Build/$(bootloader)*/*/FV/UEFIPAYLOAD.fd $(project_dir)/../output/UEFIPAYLOAD.fd; \ 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: clean:
test -d $(project_dir) && (cd $(project_dir); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0 test -d $(project_dir) && (cd $(project_dir); rm -rf Build; rm -f Conf/tools_def.txt) || exit 0