[coreboot-gerrit] Change in coreboot[master]: payloads/tianocore: ignore whitespace change when applying patches

[Piotr Król (Code Review)]

Piotr Król has uploaded this change for review. ( 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 at 3mdeb.com>
---
M payloads/external/tianocore/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)



  git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/27616/1

diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile
index 72293d8..757c9bb 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -66,7 +66,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 \

-- 
To view, visit https://review.coreboot.org/27616
To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38f7d46925cc00a2b5c5400e3fbf3579990f3fa5
Gerrit-Change-Number: 27616
Gerrit-PatchSet: 1
Gerrit-Owner: Piotr Król <piotr.krol at 3mdeb.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.coreboot.org/pipermail/coreboot-gerrit/attachments/20180724/5ed52ba1/attachment.html>