From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: bob.c.feng@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Wed, 28 Aug 2019 20:15:37 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 20:15:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,442,1559545200"; d="scan'208";a="185836890" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga006.jf.intel.com with ESMTP; 28 Aug 2019 20:15:36 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 20:15:36 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx111.amr.corp.intel.com (10.18.116.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 20:15:35 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.139]) with mapi id 14.03.0439.000; Thu, 29 Aug 2019 11:15:34 +0800 From: "Bob Feng" To: "Kinney, Michael D" , "Gao, Liming" , Leif Lindholm , "devel@edk2.groups.io" CC: "afish@apple.com" , "Laszlo Ersek (lersek@redhat.com)" Subject: Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fixed regression issue for building !x86 builds Thread-Topic: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fixed regression issue for building !x86 builds Thread-Index: AQHVXYFtWtqwsYMTkk2J3sWrOwTMHqcQEQ6AgAAWnACAADfoAIABFWMA Date: Thu, 29 Aug 2019 03:15:33 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D16152A852@SHSMSX104.ccr.corp.intel.com> References: <20190828091710.22372-1-bob.c.feng@intel.com> <20190828140129.GJ29255@bivouac.eciton.net> <4A89E2EF3DFEDB4C8BFDE51014F606A14E4DDB42@SHSMSX104.ccr.corp.intel.com> In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed at 37eef91017ad042035090cae46557f9d6e2d5917 Thanks, Bob -----Original Message----- From: Kinney, Michael D=20 Sent: Thursday, August 29, 2019 2:43 AM To: Gao, Liming ; Leif Lindholm ; devel@edk2.groups.io; Feng, Bob C ; Kinney, M= ichael D Cc: afish@apple.com; Laszlo Ersek (lersek@redhat.com) Subject: RE: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fixed regr= ession issue for building !x86 builds Hi Bob, I agree this is a critical regression issue that must be fixed for the edk= 2-stable201908 release. Tested-by: Michael D Kinney Acked-by: Michael D Kinney Thanks, Mike > -----Original Message----- > From: Gao, Liming > Sent: Wednesday, August 28, 2019 8:22 AM > To: Leif Lindholm ; devel@edk2.groups.io;=20 > Feng, Bob C > Cc: Kinney, Michael D ; afish@apple.com;=20 > Laszlo Ersek (lersek@redhat.com) > Subject: RE: [edk2-devel] [Patch][edk2-stable201908] > BaseTools: Fixed regression issue for building !x86 builds >=20 > Bob: > This fix is clear. Reviewed-by: Liming Gao >=20 > Thanks > Liming > > -----Original Message----- > > From: Leif Lindholm [mailto:leif.lindholm@linaro.org] > > Sent: Wednesday, August 28, 2019 10:01 PM > > To: devel@edk2.groups.io; Feng, Bob C > > > Cc: Gao, Liming > > Subject: Re: [edk2-devel] [Patch][edk2-stable201908] > BaseTools: Fixed > > regression issue for building !x86 builds > > > > On Wed, Aug 28, 2019 at 05:17:10PM +0800, Bob Feng > wrote: > > > BZ: > https://bugzilla.tianocore.org/show_bug.cgi?id=3D2134 > > > > > > This patch is to fix a build tool regression issue > which was > > > introduced by commit e8449e1d8e. > > > > > > In commit e8449e1d8e, build tool check the pcd > before filter out the > > > irrelevant library instance. > > > > > > The logic of evaluating the priority of the library > class > > > resolutions was not changed. > > > > Ah, OK, that greatly simplifies things. > > > > This resolves the issue(s) for me - thanks! > > > > > Cc: Liming Gao > > > Signed-off-by: Bob Feng > > > > Acked-by: Leif Lindholm > > Tested-by: Leif Lindholm > > > > > > > --- > > > .../Source/Python/Workspace/InfBuildData.py | 29 > ++++++++++--------- > > > 1 file changed, 16 insertions(+), 13 deletions(-) > > > > > > diff --git > a/BaseTools/Source/Python/Workspace/InfBuildData.py > > > b/BaseTools/Source/Python/Workspace/InfBuildData.py > > > index e63246b03b..7675b0ea00 100644 > > > --- > a/BaseTools/Source/Python/Workspace/InfBuildData.py > > > +++ > b/BaseTools/Source/Python/Workspace/InfBuildData.py > > > @@ -154,12 +154,11 @@ class > InfBuildData(ModuleBuildClassObject): > > > self._PcdComments =3D None > > > self._BuildOptions =3D None > > > self._DependencyFileList =3D None > > > self.LibInstances =3D [] > > > self.ReferenceModules =3D set() > > > - self.Guids > > > - self.Pcds > > > + > > > def SetReferenceModule(self,Module): > > > self.ReferenceModules.add(Module) > > > return self > > > > > > ## XXX[key] =3D value > > > @@ -654,10 +653,24 @@ class > InfBuildData(ModuleBuildClassObject): > > > "Value of Guid > [%s] is not found under [Guids] section in" % CName, > > > > ExtraData=3DPackageList, File=3Dself.MetaFile, > Line=3DRecord[-1]) > > > RetVal[CName] =3D Value > > > CommentRecords =3D > self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform,=20 > Record[5]] > > > self._GuidComments[CName] =3D [a[0] for > a in > > > CommentRecords] > > > + > > > + for Type in > > > [MODEL_PCD_FIXED_AT_BUILD,MODEL_PCD_PATCHABLE_IN_MODULE > ,MODEL_PCD_FEAT > > URE_FLAG,MODEL_PCD_DYNAMIC,MODEL_PCD > > _DYNAMIC_EX]: > > > + RecordList =3D self._RawData[Type, > self._Arch, self._Platform] > > > + for TokenSpaceGuid, _, _, _, _, _, > LineNo in RecordList: > > > + # get the guid value > > > + if TokenSpaceGuid not in RetVal: > > > + Value =3D > GuidValue(TokenSpaceGuid, self.Packages, > self.MetaFile.Path) > > > + if Value is None: > > > + PackageList =3D > "\n\t".join(str(P) for P in self.Packages) > > > + EdkLogger.error('build', > RESOURCE_NOT_AVAILABLE, > > > + "Value of > Guid [%s] is not found under [Guids] section in" % TokenSpaceGuid, > > > + > ExtraData=3DPackageList, File=3Dself.MetaFile, Line=3DLineNo) > > > + RetVal[TokenSpaceGuid] =3D Value > > > + > self._GuidsUsedByPcd[TokenSpaceGuid] =3D Value > > > return RetVal > > > > > > ## Retrieve include paths necessary for this > module (for Edk.x style of modules) > > > @cached_property > > > def Includes(self): > > > @@ -856,11 +869,11 @@ class > InfBuildData(ModuleBuildClassObject): > > > if file_name.upper().endswith("DEC"): > > > pkg =3D > os.path.join(TopDir,file_name) > > > return pkg > > > @cached_class_function > > > def GetGuidsUsedByPcd(self): > > > - self.Pcds > > > + self.Guid > > > return self._GuidsUsedByPcd > > > > > > ## Retrieve PCD for given type > > > def _GetPcd(self, Type): > > > Pcds =3D OrderedDict() > > > @@ -868,20 +881,10 @@ class > InfBuildData(ModuleBuildClassObject): > > > PcdList =3D [] > > > RecordList =3D self._RawData[Type, > self._Arch, self._Platform] > > > for TokenSpaceGuid, PcdCName, Setting, > Arch, Platform, Id, LineNo in RecordList: > > > PcdDict[Arch, Platform, PcdCName, > TokenSpaceGuid] =3D (Setting, LineNo) > > > PcdList.append((PcdCName, > TokenSpaceGuid)) > > > - # get the guid value > > > - if TokenSpaceGuid not in self.Guids: > > > - Value =3D GuidValue(TokenSpaceGuid, > self.Packages, self.MetaFile.Path) > > > - if Value is None: > > > - PackageList =3D > "\n\t".join(str(P) for P in self.Packages) > > > - EdkLogger.error('build', > RESOURCE_NOT_AVAILABLE, > > > - "Value of Guid > [%s] is not found under [Guids] section in" % TokenSpaceGuid, > > > - > ExtraData=3DPackageList, File=3Dself.MetaFile, Line=3DLineNo) > > > - self.Guids[TokenSpaceGuid] =3D Value > > > - > self._GuidsUsedByPcd[TokenSpaceGuid] =3D Value > > > CommentRecords =3D > self._RawData[MODEL_META_DATA_COMMENT, self._Arch, self._Platform, Id] > > > Comments =3D [] > > > for CmtRec in CommentRecords: > > > Comments.append(CmtRec[0]) > > > self._PcdComments[TokenSpaceGuid, > PcdCName] =3D Comments > > > -- > > > 2.20.1.windows.1 > > > > > > > > >=20 > > >