From de09d4cc5c5f8ddc2e92670e852fe3ae1ab7b7f4 Mon Sep 17 00:00:00 2001 From: Rene Thrane Date: Sun, 14 Sep 2025 09:20:52 +0200 Subject: [PATCH] Made git apply more tolerant of line endings and whitespace differences in patch files. This will make the patches much more compatible with patchset generated by either linux or windows. Change-Id: I9e53b50e46a3422a862bd98426289707cf01a8e5 --- .Config/FslBuildGen/BuildExternal/Tasks.py | 2 +- .Config/FslBuildGen/Tool/ToolAppMain.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.Config/FslBuildGen/BuildExternal/Tasks.py b/.Config/FslBuildGen/BuildExternal/Tasks.py index b0217974fc..c807205a6d 100644 --- a/.Config/FslBuildGen/BuildExternal/Tasks.py +++ b/.Config/FslBuildGen/BuildExternal/Tasks.py @@ -189,7 +189,7 @@ class GitApplyTask(GitBaseTask): def RunGitApply(self, sourcePatchFile: str, targetPath: str) -> None: self.LogPrint("Running git apply {0} in {1}".format(sourcePatchFile, targetPath)) - buildCommand = [self.GitCommand, 'apply', sourcePatchFile, "--whitespace=fix"] + buildCommand = [self.GitCommand, 'apply', sourcePatchFile, "--whitespace=fix", "--ignore-space-change", "--ignore-whitespace"] if self.Log.Verbosity > 0: buildCommand.append("-v") result = subprocess.call(buildCommand, cwd=targetPath) diff --git a/.Config/FslBuildGen/Tool/ToolAppMain.py b/.Config/FslBuildGen/Tool/ToolAppMain.py index fffda60308..d98b7c67b9 100644 --- a/.Config/FslBuildGen/Tool/ToolAppMain.py +++ b/.Config/FslBuildGen/Tool/ToolAppMain.py @@ -73,7 +73,7 @@ from FslBuildGen.Xml.Project.XmlProjectRootConfigFile import XmlProjectRootConfigFile -CurrentVersion = Version(3, 7, 1, 7) +CurrentVersion = Version(3, 7, 1, 8) def __AddDefaultOptions(parser: argparse.ArgumentParser, allowStandaloneMode: bool) -> None: