summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt DeVillier <matt.devillier@gmail.com>2019-03-15 14:18:09 -0500
committerPatrick Georgi <pgeorgi@google.com>2019-04-02 16:32:48 +0000
commit74dec7f51d96b154704f7ace3c84b3073945f7f5 (patch)
tree6928db3bd20e429128b4f5a45fabf7ab40b26526
parent28def8b5a02a429473d1e12f90f332625bf87316 (diff)
downloadcoreboot-74dec7f51d96b154704f7ace3c84b3073945f7f5.tar.xz
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 <matt.devillier@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/32133 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rw-r--r--payloads/external/tianocore/Makefile2
1 files changed, 1 insertions, 1 deletions
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