<p>Piotr Król has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27616">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">payloads/tianocore: ignore whitespace change when applying patches<br><br>This change is required to apply patch<br>06_CorebootPayloadPkg_keep_cb_table since conflict in white space<br>between patch and target file in edk2 makes patch rejected while<br>building under coreboot-sdk:1.52.<br><br>Change-Id: I38f7d46925cc00a2b5c5400e3fbf3579990f3fa5<br>Signed-off-by: Piotr Król <piotr.krol@3mdeb.com><br>---<br>M payloads/external/tianocore/Makefile<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/16/27616/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/payloads/external/tianocore/Makefile b/payloads/external/tianocore/Makefile</span><br><span>index 72293d8..757c9bb 100644</span><br><span>--- a/payloads/external/tianocore/Makefile</span><br><span>+++ b/payloads/external/tianocore/Makefile</span><br><span>@@ -66,7 +66,7 @@</span><br><span>               for patch in $(CURDIR)/patches/*.patch; do \</span><br><span>                         echo "Applying $$patch"; \</span><br><span>                         cd $(project_dir); \</span><br><span style="color: hsl(0, 100%, 40%);">-                    git am --keep-cr $$patch || \</span><br><span style="color: hsl(120, 100%, 40%);">+                 git am --keep-cr --ignore-space-change $$patch || \</span><br><span>                          ( echo " Error when applying patches.\n"; git am --abort; exit 1; ); \</span><br><span>             done; \</span><br><span>              if ! [ "$(TAG-y)" = "origin/master" ] ; then \</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27616">change 27616</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27616"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I38f7d46925cc00a2b5c5400e3fbf3579990f3fa5 </div>
<div style="display:none"> Gerrit-Change-Number: 27616 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Piotr Król <piotr.krol@3mdeb.com> </div>