From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1A0612119AC28 for ; Mon, 10 Dec 2018 06:59:23 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Dec 2018 06:59:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,338,1539673200"; d="scan'208";a="97601509" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga007.jf.intel.com with ESMTP; 10 Dec 2018 06:59:23 -0800 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Dec 2018 06:59:22 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 10 Dec 2018 06:59:22 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.203]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.59]) with mapi id 14.03.0415.000; Mon, 10 Dec 2018 22:59:20 +0800 From: "Gao, Liming" To: Leif Lindholm CC: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for cases Thread-Index: AQHUkCYTt440GgWGZkqBtHKwFac5TqV3YcgAgACo74D//3zDgIAAid9Q Date: Mon, 10 Dec 2018 14:59:20 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E38992D@SHSMSX104.ccr.corp.intel.com> References: <20181210011658.5212-1-bob.c.feng@intel.com> <20181210123012.cswf2pbzppqxff27@bivouac.eciton.net> <4A89E2EF3DFEDB4C8BFDE51014F606A14E3898BC@SHSMSX104.ccr.corp.intel.com> <20181210144507.34xxt26l34zwolm5@bivouac.eciton.net> In-Reply-To: <20181210144507.34xxt26l34zwolm5@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiYzA0ZDJiMTktODQzNC00YTIxLTlhZWEtYThjYzE5YWEwZjRhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiekVMR1B4YVRiU1VjMmZxaXVnQWpMZXEzZHhraTVKTklJQkd5OTZBV2ZaTDBwVUJnU1E0QnVENGVwK3B3UEVKWSJ9 dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: Fixed the build fail issue for cases X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Dec 2018 14:59:24 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Leif: OK. I understand your point.=20 Thanks Liming > -----Original Message----- > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > Sent: Monday, December 10, 2018 10:45 PM > To: Gao, Liming > Cc: Feng, Bob C ; edk2-devel@lists.01.org > Subject: Re: [edk2] [Patch V2] BaseTools: Fixed the build fail issue for = cases >=20 > On Mon, Dec 10, 2018 at 02:36:59PM +0000, Gao, Liming wrote: > > Leif: > > So, you don't think to need highlight which commit causes the > > regression issue in the commit message. I suggest to put this > > information into BZ description instead of commit message. >=20 > Oh, I absolutely want the commit hash in the message. > And ideally in a longer form, like Linux requires: > 12-characters of hash followed by the subject of the faulty commit > inside (""). But the format is just a question of taste, the > information is what is important. >=20 > If I happen to lose internet connection, I still want to be able to > see which previous commit is being fixed by a patch. >=20 > But it shouldn't come in the form: > V2: > ... > V1: > ... >=20 > It should just form part of a coherent commit message. > The development history of a patch is not interesting to the master > branch of the repository. >=20 > Regards, >=20 > Leif >=20 >=20 > > Thanks > > Liming > > > -----Original Message----- > > > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf O= f Leif Lindholm > > > Sent: Monday, December 10, 2018 8:30 PM > > > To: Feng, Bob C > > > Cc: edk2-devel@lists.01.org; Gao, Liming > > > Subject: Re: [edk2] [Patch V2] BaseTools: Fixed the build fail issue = for cases > > > > > > Hi Bob, > > > > > > On Mon, Dec 10, 2018 at 09:16:58AM +0800, BobCF wrote: > > > > From: "Feng, Bob C" > > > > > > > > V2: > > > > > > Patch version information does not belong in the commit message. > > > It belongs in a cover letter, or if a cover letter is not used, you > > > can put these details below the --- line. This way it gets filtered > > > out by git. > > > > > > The patch commit message should end up being a description of what th= e > > > patch is and does, not the development process that got us there. > > > > > > Regards, > > > > > > Leif > > > > > > > update the commit log. This issue is introduced by > > > > the commit 72a1d77694d51914c0dd6aa97dbfa58634b0a4a5 > > > > > > > > V1: > > > > https://bugzilla.tianocore.org/show_bug.cgi?id=3D1386 > > > > 1. There is no Pcd value assignment in Dsc file > > > > 2. There are duplicate Pcd filed assignment > > > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > Signed-off-by: Bob Feng > > > > Cc: Liming Gao > > > > --- > > > > BaseTools/Source/Python/Workspace/BuildClassObject.py | 2 +- > > > > BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 +- > > > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/BaseTools/Source/Python/Workspace/BuildClassObject.py = b/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > > index 008eee1a16..d02232b546 100644 > > > > --- a/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > > +++ b/BaseTools/Source/Python/Workspace/BuildClassObject.py > > > > @@ -289,11 +289,11 @@ class StructurePcd(PcdClassObject): > > > > if DefaultStoreName not in self.SkuOverrideValues[SkuName]= : > > > > self.SkuOverrideValues[SkuName][DefaultStoreName] =3D = OrderedDict() > > > > if DimensionAttr not in self.SkuOverrideValues[SkuName][De= faultStoreName]: > > > > self.SkuOverrideValues[SkuName][DefaultStoreName][Dime= nsionAttr] =3D collections.OrderedDict() > > > > if FieldName in self.SkuOverrideValues[SkuName][DefaultSto= reName][DimensionAttr]: > > > > - del self.SkuOverrideValues[SkuName][DefaultStoreName][= FieldName][DimensionAttr] > > > > + del self.SkuOverrideValues[SkuName][DefaultStoreName][= DimensionAttr][FieldName] > > > > self.SkuOverrideValues[SkuName][DefaultStoreName][Dimensio= nAttr][FieldName] =3D [Value.strip(), FileName, LineNo] > > > > return self.SkuOverrideValues[SkuName][DefaultStoreName][D= imensionAttr][FieldName] > > > > > > > > def SetPcdMode (self, PcdMode): > > > > self.PcdMode =3D PcdMode > > > > diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/= BaseTools/Source/Python/Workspace/MetaFileParser.py > > > > index 4bd52619a9..eaedba0c12 100644 > > > > --- a/BaseTools/Source/Python/Workspace/MetaFileParser.py > > > > +++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py > > > > @@ -1201,11 +1201,11 @@ class DscParser(MetaFileParser): > > > > else: > > > > self._ValueList =3D None > > > > return > > > > TokenList =3D GetSplitValueList(self._CurrentLine, TAB_VAL= UE_SPLIT, 1) > > > > self._CurrentPcdName =3D TokenList[0] > > > > - if TokenList[1].strip().startswith("{CODE"): > > > > + if len(TokenList) =3D=3D 2 and TokenList[1].strip().starts= with("{CODE"): > > > > self._PcdDataTypeCODE =3D True > > > > self._PcdCodeValue =3D TokenList[1].strip() > > > > > > > > if self._PcdDataTypeCODE: > > > > if self._CurrentLine.endswith(")}"): > > > > -- > > > > 2.19.1.windows.1 > > > > > > > > _______________________________________________ > > > > edk2-devel mailing list > > > > edk2-devel@lists.01.org > > > > https://lists.01.org/mailman/listinfo/edk2-devel > > > _______________________________________________ > > > edk2-devel mailing list > > > edk2-devel@lists.01.org > > > https://lists.01.org/mailman/listinfo/edk2-devel