From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: devel@edk2.groups.io, "Antoine Cœur" <coeur@gmx.fr>
Subject: Re: [edk2-devel] [PATCH] BaseTools: Fix various typos
Date: Thu, 4 Jul 2019 13:16:35 +0200 [thread overview]
Message-ID: <5c42da1c-e9f0-2fb5-4cf1-05dfbe7c1d41@redhat.com> (raw)
In-Reply-To: <18238.1562166539775741502@groups.io>
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 <coeur@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).
Regards,
Phil.
next prev parent reply other threads:[~2019-07-04 11:16 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-03 15:08 [PATCH] BaseTools: Fix various typos Cœur
2019-07-04 11:16 ` Philippe Mathieu-Daudé [this message]
2019-07-04 11:21 ` [edk2-devel] " Philippe Mathieu-Daudé
2019-07-04 11:47 ` Cœur
2019-07-04 13:03 ` Leif Lindholm
2019-07-05 0:29 ` Bob Feng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5c42da1c-e9f0-2fb5-4cf1-05dfbe7c1d41@redhat.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox