From 80346d04906261b258e1f7ea737a74beac08b11a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Kr=C3=B3l?= Date: Tue, 24 Jul 2018 02:33:27 +0200 Subject: payloads/tianocore: ignore whitespace change when applying patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: https://review.coreboot.org/27616 Tested-by: build bot (Jenkins) Reviewed-by: Patrick Rudolph Reviewed-by: Martin Roth --- payloads/external/tianocore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 \ -- cgit v1.2.3