From nobody Wed May 8 17:39:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+46196+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46196+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1566446457; cv=none; d=zoho.com; s=zohoarc; b=RFy/ee8l2PNfmkPMyEODvETox2SHBchZsxoa6jiY+9nPoocfHvD5XuU1IBiJNNPLOk9Qj/Qu1uaJ0EpfbLA/6mlsn/PdvJEMjwFHCb/capp3AtZLrFn4GmcpXWptXEJX5jkDC9X0aMfAAzhnohHpdsuDMLSs8PL8uJl9yY4bphk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566446457; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=E8qiQ49/QioEjR4PdwjMCD/f7fANPJJxSqzjincw3IE=; b=a+2SS4ikjreY3Y92fBtibZP7K2oxOT6BzzHWlnPpUVTtI2ifNw/ZGjrzEHeiwtB7pnWiR5g9lODnL3YU3iU2QoYzOMFMfw25CD81nyJS2+VQT/YqUpm3YJ9t7X8prRc/MZTYStcZefBbX+sf1DsgJDJ1bj5E0clsZnRZQo38YnA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+46196+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1566446457178980.0250360347729; Wed, 21 Aug 2019 21:00:57 -0700 (PDT) Return-Path: X-Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by groups.io with SMTP; Wed, 21 Aug 2019 21:00:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2019 21:00:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,415,1559545200"; d="scan'208";a="183745571" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga006.jf.intel.com with ESMTP; 21 Aug 2019 21:00:54 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [Patch V2][edk2-stable201908] BaseTools: Incorrect error message for library instance not found Date: Thu, 22 Aug 2019 12:00:46 +0800 Message-Id: <20190822040046.12628-1-bob.c.feng@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,bob.c.feng@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1566446456; bh=BU9Y+NFN0uLJaAj7HXmrKiwAqENjl2Q5zJvt85zYK0k=; h=Cc:Date:From:Reply-To:Subject:To; b=eDuhlcQu+lQCG4wP4Got1Ruo14MFay6hL9+u6KR9AtEVBLZ9jtOKqKXEdrc/r05rCiw KUUhX4ZlN3gpMunjen/QoBILIUIwTHYxynjnLGNCgFva9El2cJJzJvGHUsXN9GdZ2K4Bp fPB/OCextkFkk33hrbgTXsBcEMD7ulKS6h4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2099 This is a regression issue introduced by commit e8449e. This patch is to fix this issue. Signed-off-by: Bob Feng Cc: Liming Gao Reviewed-by: Liming Gao --- V2: We need to check if a inf is a Library or a Module. BaseTools/Source/Python/AutoGen/DataPipe.py | 2 +- BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 2 +- BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py | 4 +++- .../Source/Python/Workspace/WorkspaceCommon.py | 13 +++++++------ 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source= /Python/AutoGen/DataPipe.py index 2ca4f9ff4a..8b8cfd1c51 100755 --- a/BaseTools/Source/Python/AutoGen/DataPipe.py +++ b/BaseTools/Source/Python/AutoGen/DataPipe.py @@ -87,11 +87,11 @@ class MemoryDataPipe(DataPipe): #Module's Library Instance ModuleLibs =3D {} libModules =3D {} for m in PlatformInfo.Platform.Modules: module_obj =3D BuildDB.BuildObject[m,PlatformInfo.Arch,Platfor= mInfo.BuildTarget,PlatformInfo.ToolChain] - Libs =3D GetModuleLibInstances(module_obj, PlatformInfo.Platfo= rm, BuildDB.BuildObject, PlatformInfo.Arch,PlatformInfo.BuildTarget,Platfor= mInfo.ToolChain) + Libs =3D GetModuleLibInstances(module_obj, PlatformInfo.Platfo= rm, BuildDB.BuildObject, PlatformInfo.Arch,PlatformInfo.BuildTarget,Platfor= mInfo.ToolChain,PlatformInfo.MetaFile,EdkLogger) for lib in Libs: try: libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Ar= ch,lib.MetaFile.Path)].append((m.File,m.Root,module_obj.Arch,m.Path)) except: libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Ar= ch,lib.MetaFile.Path)] =3D [(m.File,m.Root,module_obj.Arch,m.Path)] diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools= /Source/Python/AutoGen/PlatformAutoGen.py index dd629ba2fa..565424a95e 100644 --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py @@ -1087,11 +1087,11 @@ class PlatformAutoGen(AutoGen): def GetAllModuleInfo(self,WithoutPcd=3DTrue): ModuleLibs =3D set() for m in self.Platform.Modules: module_obj =3D self.BuildDatabase[m,self.Arch,self.BuildTarget= ,self.ToolChain] if not bool(module_obj.LibraryClass): - Libs =3D GetModuleLibInstances(module_obj, self.Platform, = self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain) + Libs =3D GetModuleLibInstances(module_obj, self.Platform, = self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain,self.MetaFile= ,EdkLogger) else: Libs =3D [] ModuleLibs.update( set([(l.MetaFile.File,l.MetaFile.Root,l.Met= aFile.Path,l.MetaFile.BaseName,l.MetaFile.OriginalPath,l.Arch,True) for l i= n Libs])) if WithoutPcd and module_obj.PcdIsDriver: continue diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTool= s/Source/Python/AutoGen/WorkspaceAutoGen.py index ea0d8f8bfb..2494267472 100644 --- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py +++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py @@ -246,11 +246,13 @@ class WorkspaceAutoGen(AutoGen): if BuildData.MetaFile.Ext =3D=3D '.inf' and str(BuildData)= in Platform.Modules : Libs.extend(GetModuleLibInstances(BuildData, Platform, self.BuildDatabase, Arch, self.BuildTarget, - self.ToolChain + self.ToolChain, + self.Platform.MetaFile, + EdkLogger )) for BuildData in list(self.BuildDatabase._CACHE_.values()): if BuildData.Arch !=3D Arch: continue if BuildData.MetaFile.Ext =3D=3D '.inf': diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseToo= ls/Source/Python/Workspace/WorkspaceCommon.py index 76583f46e5..0b11ec2d59 100644 --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py @@ -13,10 +13,11 @@ from .BuildClassObject import LibraryClassObject import Common.GlobalData as GlobalData from Workspace.BuildClassObject import StructurePcd from Common.BuildToolError import RESOURCE_NOT_AVAILABLE from Common.BuildToolError import OPTION_MISSING from Common.BuildToolError import BUILD_ERROR +import Common.EdkLogger as EdkLogger =20 class OrderedListDict(OrderedDict): def __init__(self, *args, **kwargs): super(OrderedListDict, self).__init__(*args, **kwargs) self.default_factory =3D list @@ -83,11 +84,11 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Targe= t, Toolchain, additionalP # @param Target: Current target # @param Toolchain: Current toolchain # @retval: List of dependent libraries which are InfBuildData instances # def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, To= olchain): - return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Ta= rget, Toolchain) + return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Ta= rget, Toolchain,Platform.MetaFile,EdkLogger) =20 def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, T= oolchain, FileName =3D '', EdkLogger =3D None): if Module.LibInstances: return Module.LibInstances ModuleType =3D Module.ModuleType @@ -111,11 +112,11 @@ def GetModuleLibInstances(Module, Platform, BuildData= base, Arch, Target, Toolcha LibraryConsumerList =3D [Module] Constructor =3D [] ConsumedByList =3D OrderedListDict() LibraryInstance =3D OrderedDict() =20 - if FileName: + if not Module.LibraryClass: EdkLogger.verbose("") EdkLogger.verbose("Library instances of module [%s] [%s]:" % (str(= Module), Arch)) =20 while len(LibraryConsumerList) > 0: M =3D LibraryConsumerList.pop() @@ -124,11 +125,11 @@ def GetModuleLibInstances(Module, Platform, BuildData= base, Arch, Target, Toolcha # override library instance for this module LibraryPath =3D Platform.Modules[str(Module)].LibraryClass= es.get(LibraryClassName,Platform.LibraryClasses[LibraryClassName, ModuleTyp= e]) if LibraryPath is None: LibraryPath =3D M.LibraryClasses.get(LibraryClassName) if LibraryPath is None: - if FileName: + if not Module.LibraryClass: EdkLogger.error("build", RESOURCE_NOT_AVAILABL= E, "Instance of library class [%s= ] is not found" % LibraryClassName, File=3DFileName, ExtraData=3D"in [%s] [%s]\n\tc= onsumed by module [%s]" % (str(M), Arch, str(Module))) else: @@ -141,21 +142,21 @@ def GetModuleLibInstances(Module, Platform, BuildData= base, Arch, Target, Toolcha elif LibraryModule.LibraryClass is None \ or len(LibraryModule.LibraryClass) =3D=3D 0 \ or (ModuleType !=3D SUP_MODULE_USER_DEFINED and Modul= eType !=3D SUP_MODULE_HOST_APPLICATION and ModuleType not in LibraryModule.LibraryClass[= 0].SupModList): # only USER_DEFINED can link against any library insta= nce despite of its SupModList - if FileName: + if not Module.LibraryClass: EdkLogger.error("build", OPTION_MISSING, "Module type [%s] is not supported= by library instance [%s]" \ % (ModuleType, LibraryPath), File= =3DFileName, ExtraData=3D"consumed by [%s]" % s= tr(Module)) else: return [] =20 LibraryInstance[LibraryClassName] =3D LibraryModule LibraryConsumerList.append(LibraryModule) - if FileName: + if not Module.LibraryClass: EdkLogger.verbose("\t" + str(LibraryClassName) + " : "= + str(LibraryModule)) else: LibraryModule =3D LibraryInstance[LibraryClassName] =20 if LibraryModule is None: @@ -232,11 +233,11 @@ def GetModuleLibInstances(Module, Platform, BuildData= base, Arch, Target, Toolcha # # if any remaining node Item in the graph has a constructor and an inc= oming edge, then the graph has a cycle # for Item in LibraryList: if ConsumedByList[Item] and Item in Constructor and len(Constructo= r) > 1: - if FileName: + if not Module.LibraryClass: ErrorMessage =3D "\tconsumed by " + "\n\tconsumed by ".joi= n(str(L) for L in ConsumedByList[Item]) EdkLogger.error("build", BUILD_ERROR, 'Library [%s] with c= onstructors has a cycle' % str(Item), ExtraData=3DErrorMessage, File=3DFileName) else: return [] --=20 2.20.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#46196): https://edk2.groups.io/g/devel/message/46196 Mute This Topic: https://groups.io/mt/32986598/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-