From 74dec7f51d96b154704f7ace3c84b3073945f7f5 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Fri, 15 Mar 2019 14:18:09 -0500 Subject: [PATCH] payloads/tianocore: Don't fail on resetting boot logo If using a commit/branch which doesn't use a boot logo, we don't want the build to fail unnecessarily Test: build with upstream Tianocore commit hash, avoid failure after successful compilation. Change-Id: Ic41bacbb97926e9538f434aecc0f0eebc5f6326f Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/32133 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Georgi --- payloads/external/tianocore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 2c7439ca7b..f208e5952f 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -100,7 +100,7 @@ build: update checktools fi; \ build $(BUILD_STR); \ mv $(project_dir)/Build/CorebootPayloadPkg*/*/FV/UEFIPAYLOAD.fd $(project_dir)/Build/UEFIPAYLOAD.fd; \ - git checkout CorebootPayloadPkg/Logo/Logo.bmp > /dev/null 2>&1 + git checkout CorebootPayloadPkg/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