Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/27616 )
Change subject: payloads/tianocore: ignore whitespace change when applying patches ......................................................................
payloads/tianocore: ignore whitespace change when applying patches
This change is required to apply patch 06_CorebootPayloadPkg_keep_cb_table since conflict in white space between patch and target file in edk2 makes patch rejected while building under coreboot-sdk:1.52.
Change-Id: I38f7d46925cc00a2b5c5400e3fbf3579990f3fa5 Signed-off-by: Piotr Król piotr.krol@3mdeb.com Reviewed-on: https://review.coreboot.org/27616 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Patrick Rudolph siro@das-labor.org Reviewed-by: Martin Roth martinroth@google.com --- M payloads/external/tianocore/Makefile 1 file changed, 1 insertion(+), 1 deletion(-)
Approvals: build bot (Jenkins): Verified Martin Roth: Looks good to me, approved Patrick Rudolph: Looks good to me, but someone else must approve
diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile index c280fe1b..747ee47 100644 --- a/payloads/external/tianocore/Makefile +++ b/payloads/external/tianocore/Makefile @@ -69,7 +69,7 @@ for patch in $(CURDIR)/patches/*.patch; do \ echo "Applying $$patch"; \ cd $(project_dir); \ - git am --keep-cr $$patch || \ + git am --keep-cr --ignore-space-change $$patch || \ ( echo " Error when applying patches.\n"; git am --abort; exit 1; ); \ done; \ if ! [ "$(TAG-y)" = "origin/master" ] ; then \