From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: liming.gao@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Wed, 28 Aug 2019 08:22:28 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 08:22:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,441,1559545200"; d="scan'208";a="171573783" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga007.jf.intel.com with ESMTP; 28 Aug 2019 08:22:27 -0700 Received: from fmsmsx117.amr.corp.intel.com (10.18.116.17) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 08:22:26 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx117.amr.corp.intel.com (10.18.116.17) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 08:22:26 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.62]) with mapi id 14.03.0439.000; Wed, 28 Aug 2019 23:22:24 +0800 From: "Liming Gao" To: Leif Lindholm , "devel@edk2.groups.io" , "Feng, Bob C" CC: "Kinney, Michael D" , "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: AQHVXYFt3n2HCG9ZxUSez/o0kyaPpqcQEQ6AgACcXtA= Date: Wed, 28 Aug 2019 15:22:24 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4DDB42@SHSMSX104.ccr.corp.intel.com> References: <20190828091710.22372-1-bob.c.feng@intel.com> <20190828140129.GJ29255@bivouac.eciton.net> In-Reply-To: <20190828140129.GJ29255@bivouac.eciton.net> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNDk2N2UwNzYtYWJlZS00NDkzLTliNzAtOTNkMzM1ODY1MWNiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiN1FKSXhKNWxOV3lMd1JUTXNhSVE0Yjg3bFlEMlFINGxBQWh2MVwvb21NcFlrU3BzNHA0WHVpd3ZpSitWM1wvWGNTIn0= dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Bob: This fix is clear. Reviewed-by: Liming Gao 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 re= gression issue for building !x86 builds >=20 > 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. >=20 > Ah, OK, that greatly simplifies things. >=20 > This resolves the issue(s) for me - thanks! >=20 > > Cc: Liming Gao > > Signed-off-by: Bob Feng >=20 > Acked-by: Leif Lindholm > Tested-by: Leif Lindholm >=20 >=20 > > --- > > .../Source/Python/Workspace/InfBuildData.py | 29 ++++++++++--------= - > > 1 file changed, 16 insertions(+), 13 deletions(-) > > > > diff --git a/BaseTools/Source/Python/Workspace/InfBuildData.py b/BaseT= ools/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 unde= r [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, Record[5]] > > self._GuidComments[CName] =3D [a[0] for a in CommentRecor= ds] > > + > > + for Type in > [MODEL_PCD_FIXED_AT_BUILD,MODEL_PCD_PATCHABLE_IN_MODULE,MODEL_PCD_FEATUR= E_FLAG,MODEL_PCD_DYNAMIC,MODEL_PCD > _DYNAMIC_EX]: > > + RecordList =3D self._RawData[Type, self._Arch, self._Plat= form] > > + 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 s= elf.Packages) > > + EdkLogger.error('build', RESOURCE_NOT_AVAILAB= LE, > > + "Value of Guid [%s] is not fo= und 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 st= yle 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, Li= neNo in RecordList: > > PcdDict[Arch, Platform, PcdCName, TokenSpaceGuid] =3D (Se= tting, LineNo) > > PcdList.append((PcdCName, TokenSpaceGuid)) > > - # get the guid value > > - if TokenSpaceGuid not in self.Guids: > > - Value =3D GuidValue(TokenSpaceGuid, self.Packages, se= lf.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=3Ds= elf.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 > >