summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Król <piotr.krol@3mdeb.com>2018-07-24 02:33:27 +0200
committerPatrick Georgi <pgeorgi@google.com>2018-09-28 09:52:27 +0000
commit80346d04906261b258e1f7ea737a74beac08b11a (patch)
treed771f18a58ce36cfc02dd1b017726e7f490a98ff
parent5b2a2d008f3aa43b21fa89ab2160e287cb31f05a (diff)
downloadcoreboot-80346d04906261b258e1f7ea737a74beac08b11a.tar.xz
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>
-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 c280fe1b6d..747ee47b06 100644
--- a/payloads/external/tianocore/Makefile
+++ b/payloads/external/tianocore/Makefile
@@ -69,7 +69,7 @@ $(project_dir)/.version_$(TAG-y): fetch
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 \