On 7/4/19 1:16 PM, Philippe Mathieu-Daudé wrote: > Hi Antoine, > > On 7/3/19 5:08 PM, Cœur wrote: >> Fix various typos in BaseTools. >> >> Contributed-under: TianoCore Contribution Agreement 1.1 >> Signed-off-by: Coeur <co...@gmx.fr> >> --- >> BaseTools/Conf/XMLSchema/DistributionPackage.xsd | 8 ++++---- >> .../plugins/EdkPlugins/edk2/model/doxygengen.py | 2 +- >> .../plugins/EdkPlugins/edk2/model/doxygengen_spec.py | 2 +- >> BaseTools/Source/C/Common/FirmwareVolumeBuffer.c | 4 ++-- >> BaseTools/Source/C/Include/Common/BaseTypes.h | 2 +- >> BaseTools/Source/C/Makefiles/NmakeSubdirs.py | 2 +- >> BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c | 2 +- >> BaseTools/Source/C/VfrCompile/Pccts/h/err.h | 2 +- >> BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++-- >> BaseTools/Source/Python/BPDG/GenVpd.py | 6 +++--- >> BaseTools/Source/Python/Common/ToolDefClassObject.py | 2 +- >> BaseTools/Source/Python/UPT/Library/DataType.py | 2 +- >> BaseTools/Source/Python/UPT/Library/StringUtils.py | 2 +- >> BaseTools/Source/Python/UPT/Logger/StringTable.py | 2 +- >> .../Python/UPT/Object/Parser/InfBuildOptionObject.py | 2 +- >> 15 files changed, 22 insertions(+), 22 deletions(-) >> >> diff --git a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> index 7499c325c3..67be9c8f32 100644 >> --- a/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> +++ b/BaseTools/Conf/XMLSchema/DistributionPackage.xsd >> @@ -166,7 +166,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >> Package. >> </xs:documentation> >> <xs:documentation xml:lang="en-us"> >> - Each Distribution Package is uniquely identified by it's >> + Each Distribution Package is uniquely identified by its >> GUID and Version number. >> </xs:documentation> >> </xs:annotation> > > Your patch is throwing a bunch of errors: > > Applying: BaseTools: Fix various typos > error: patch failed: BaseTools/Conf/XMLSchema/DistributionPackage.xsd:166 > error: BaseTools/Conf/XMLSchema/DistributionPackage.xsd: patch does not > apply > error: patch failed: > BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py:792 > error: > BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen.py: > patch does not apply > error: patch failed: > BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py:793 > error: > BaseTools/Scripts/PackageDocumentTools/plugins/EdkPlugins/edk2/model/doxygengen_spec.py: > patch does not apply > error: patch failed: BaseTools/Source/C/Common/FirmwareVolumeBuffer.c:937 > error: BaseTools/Source/C/Common/FirmwareVolumeBuffer.c: patch does not > apply > error: patch failed: BaseTools/Source/C/Include/Common/BaseTypes.h:151 > error: BaseTools/Source/C/Include/Common/BaseTypes.h: patch does not apply > error: patch failed: BaseTools/Source/C/Makefiles/NmakeSubdirs.py:104 > error: BaseTools/Source/C/Makefiles/NmakeSubdirs.py: patch does not apply > error: patch failed: BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c:298 > error: BaseTools/Source/C/VfrCompile/Pccts/antlr/lex.c: patch does not apply > error: patch failed: BaseTools/Source/C/VfrCompile/Pccts/h/err.h:649 > error: BaseTools/Source/C/VfrCompile/Pccts/h/err.h: patch does not apply > error: patch failed: BaseTools/Source/Python/AutoGen/AutoGen.py:3030 > error: BaseTools/Source/Python/AutoGen/AutoGen.py: patch does not apply > error: patch failed: BaseTools/Source/Python/BPDG/GenVpd.py:312 > error: BaseTools/Source/Python/BPDG/GenVpd.py: patch does not apply > error: patch failed: > BaseTools/Source/Python/Common/ToolDefClassObject.py:105 > error: BaseTools/Source/Python/Common/ToolDefClassObject.py: patch does > not apply > error: patch failed: BaseTools/Source/Python/UPT/Library/DataType.py:210 > error: BaseTools/Source/Python/UPT/Library/DataType.py: patch does not apply > error: patch failed: BaseTools/Source/Python/UPT/Library/StringUtils.py:863 > error: BaseTools/Source/Python/UPT/Library/StringUtils.py: patch does > not apply > error: patch failed: BaseTools/Source/Python/UPT/Logger/StringTable.py:251 > error: BaseTools/Source/Python/UPT/Logger/StringTable.py: patch does not > apply > error: patch failed: > BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py:49 > error: > BaseTools/Source/Python/UPT/Object/Parser/InfBuildOptionObject.py: patch > does not apply > Patch failed at 0001 BaseTools: Fix various typos > > I noticed Leif could apply them via his GMail web client. I'll see if I > can download it from group.io directly, but it would be nice if you > could use the proper patch workflow (I remember you submitted patch in > proper form in February).
Well, the same occurs when copy/pasting output from https://edk2.groups.io/g/devel/message/43220 I also tried logging into the GMail interface (I usually directly use Thunderbird or mutt) and I can not apply your patch neither. Let's see if other are more luckier than I am. Regards, Phil. -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#43265): https://edk2.groups.io/g/devel/message/43265 Mute This Topic: https://groups.io/mt/32298356/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
