GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Piotr Król 2018-07-24 02:33:27 +02:00 committed by Patrick Georgi
parent 5b2a2d008f
commit 80346d0490
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
payloads/external/tianocore/Makefile vendored
View File

@ -69,7 +69,7 @@ $(project_dir)/.version_$(TAG-y): fetch
for patch in $(CURDIR)/patches/*.patch; do \ for patch in $(CURDIR)/patches/*.patch; do \
echo "Applying $$patch"; \ echo "Applying $$patch"; \
cd $(project_dir); \ 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; ); \ ( echo " Error when applying patches.\n"; git am --abort; exit 1; ); \
done; \ done; \
if ! [ "$(TAG-y)" = "origin/master" ] ; then \ if ! [ "$(TAG-y)" = "origin/master" ] ; then \