[Bug]: TFA Build Can Fail When Applying Git Patches

[makubacki]

Is there an existing issue for this?

• I have searched existing issues

Current Behavior

The TFA build run in post-build runs git am to apply git patches in the repo. This can fail as follows:

INFO - ------------------------------------------------
INFO - --------------Cmd Output Starting---------------
INFO - ------------------------------------------------
INFO - warning: quoted CRLF detected
INFO - /workspaces/mu_tiano_platforms/.git/modules/Silicon/Arm/TFA/rebase-apply/patch:16: trailing whitespace.
INFO - /*
INFO - /workspaces/mu_tiano_platforms/.git/modules/Silicon/Arm/TFA/rebase-apply/patch:17: trailing whitespace.
INFO -  * Copyright (c) 2022, Arm Limited. All rights reserved.
INFO - /workspaces/mu_tiano_platforms/.git/modules/Silicon/Arm/TFA/rebase-apply/patch:18: trailing whitespace.
INFO -  *
INFO - /workspaces/mu_tiano_platforms/.git/modules/Silicon/Arm/TFA/rebase-apply/patch:19: trailing whitespace.
INFO -  * SPDX-License-Identifier: BSD-3-Clause
INFO - /workspaces/mu_tiano_platforms/.git/modules/Silicon/Arm/TFA/rebase-apply/patch:20: trailing whitespace.
INFO -  */
INFO - error: corrupt patch at line 195
INFO - hint: Use 'git am --show-current-patch=diff' to see the failed patch
INFO - Applying: Changes needed to hack through QEMU SBSA usage
INFO - Patch failed at 0001 Changes needed to hack through QEMU SBSA usage
INFO - When you have resolved this problem, run "git am --continue".
INFO - If you prefer to skip this patch, run "git am --skip" instead.
INFO - To restore the original branch and stop patching, run "git am --abort".

Expected Behavior

The build is not brittle and runs without depending on git am success.

Steps To Reproduce

1. Open the repo in the .devcontainer docker container
2. Build QemuSbsaPkg

Build Environment

- OS(s): Ubuntu 24.04 (Mu DevOps docker container)
- Tool Chain(s): GCC5

Version Information

Commit: 10b114b5548c4353808f76cd2dba0d68861cfebd (current main tip)

Urgency

Medium

Are you going to fix this?

Someone else needs to fix it

Do you need maintainer feedback?

No maintainer feedback needed

Anything else?

No response

[mu-automation]

This issue has been automatically marked as stale because it has not had activity in 45 days. It will be closed if no further activity occurs within 7 days. Thank you for your contributions.

[mu-automation]

This issue has been automatically been closed because it did not have any activity in 45 days and no follow up within 7 days after being marked stale. Thank you for your contributions.

[makubacki]

Reopening for @eeshanl to update.

[eeshanl]

We now have standalone builds that build the binaries for HAF/TFA apart of releases in mu_tiano_platforms and patina-qemu, so a developer by default will no longer need to go through this flow of patching and building TFA unless they specify HAF_TFA_BUILD=TRUE in there build flags. In the case where the developer does build with HAF_TFA_BUILD=TRUE, they could still potentially run into this issue. What is the plan is to remove TFA git patches altogether? @makubacki @kuqin12