Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/32133 )
Change subject: payloads/tianocore: Don't fail on resetting boot logo ......................................................................
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 --- M payloads/external/tianocore/Makefile 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index 2c7439c..f208e59 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -100,7 +100,7 @@ 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