From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: redhat.com, ip: 209.85.128.67, mailfrom: philmd@redhat.com) Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by groups.io with SMTP; Thu, 04 Jul 2019 04:21:49 -0700 Received: by mail-wm1-f67.google.com with SMTP id h19so5063878wme.0 for ; Thu, 04 Jul 2019 04:21:48 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=XtBwOUheMP1ZOP8fWcF7OBU4Kzf/0xNnklP5p2Dsi+Q=; b=rvQuokHdKRP8neYP3RpcfA//UaSAB7J9RgKRyk+x7wKX81ruB1l0qzqG5vFNFyjsvS IFPgxkZAvH+4ki3qk/9hHAyZu/spemLsXjn3BieiTPqTF+dJ54nhgVH+zsOec9UDZ4+w nODtd/6yO/g6VnP5iM7NzTr+Nsg0tOFfOnMYZlHdPCVBtwzsfExybwukagjokGAQALRw rgAaQAQm2mUy3CI8U3TIJk6ky1EQIwMvK9rWdbW77JmQ19umnhDNQDNWKgr0Q6IWG1fR 7Xk+dt4o6vdhmPPR53d498W53UvRhyRGHiXKRySeZSv9UAn/CcWXiPNOdn33s1973v5g UcAQ== X-Gm-Message-State: APjAAAX29eGDqvSpk/iTmdp2qFi6UUmw1/wPnKIZQbyEF1Msoqdr1HGU 9WScSXVizrakRlYsbdekmmK7Vg== X-Google-Smtp-Source: APXvYqwItUhKjrVvijTUa/aLSvtXJhrzMV3S+MXLAzbDve+phrE5gRi8h+KDrxUMkD7dUq+2T71MwQ== X-Received: by 2002:a1c:7e14:: with SMTP id z20mr11901166wmc.83.1562239307421; Thu, 04 Jul 2019 04:21:47 -0700 (PDT) Return-Path: Received: from [192.168.1.38] (56.red-88-18-140.staticip.rima-tde.net. [88.18.140.56]) by smtp.gmail.com with ESMTPSA id n125sm7246562wmf.6.2019.07.04.04.21.46 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 04:21:46 -0700 (PDT) Subject: Re: [edk2-devel] [PATCH] BaseTools: Fix various typos From: =?UTF-8?B?UGhpbGlwcGUgTWF0aGlldS1EYXVkw6k=?= To: devel@edk2.groups.io, =?UTF-8?Q?Antoine_C=c5=93ur?= References: <18238.1562166539775741502@groups.io> <5c42da1c-e9f0-2fb5-4cf1-05dfbe7c1d41@redhat.com> Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: <9d03353f-7a58-429c-3f3c-21c6e60f39f1@redhat.com> Date: Thu, 4 Jul 2019 13:21:46 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 MIME-Version: 1.0 In-Reply-To: <5c42da1c-e9f0-2fb5-4cf1-05dfbe7c1d41@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit 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 >> --- >>  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. >>               >>               >> -              Each Distribution Package is uniquely identified by it's >> +              Each Distribution Package is uniquely identified by its >>                GUID and Version number. >>               >>             > > 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.