From nobody Wed May 1 11:49:20 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+46133+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+46133+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1566368849; cv=none; d=zoho.com; s=zohoarc; b=JNNzAzowMSRS7akDRhTzQiHRY4YSfT3powDksrLJbSpGpyc7E0jClnECJJ9+3AIgejyCjED4CZSjqm7MAcHXpTxRAn2BVW+0x4JHDnBxkv02qXHFYpuqcS02M47oGDYjsQadS9HyUux3w43JoCqc1I2gZ2MdHY1trqWxryr7VEE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566368849; h=Content-Transfer-Encoding:Cc:Date:From:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To:ARC-Authentication-Results; bh=SR9qU39ygMQLC7+P5+Wc/oQvXEbLEV/Lb7L9bMCn55g=; b=LzVWbmhZDqYlhqlahRRVTKJM7h5C3prLxJ8Ku60DmncOWjDAANPbEE9O5FP5IWCdB8z7E8vNSSKd+MM80t4kqJRIBoOIQQSRRNjks6BHyJ0aJf5q/xwQkdvQbE6008JmAERe1omb/xkcfOt2UDhYpkti177Iil+UjvxoKwj4VqQ= 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+46133+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 1566368849000538.51535810873; Tue, 20 Aug 2019 23:27:29 -0700 (PDT) Return-Path: X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Tue, 20 Aug 2019 23:27:28 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Aug 2019 23:27:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,411,1559545200"; d="scan'208";a="329927649" X-Received: from shwdepsi1121.ccr.corp.intel.com ([10.239.158.47]) by orsmga004.jf.intel.com with ESMTP; 20 Aug 2019 23:27:26 -0700 From: "Bob Feng" To: devel@edk2.groups.io Cc: Bob Feng , Liming Gao Subject: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found Date: Wed, 21 Aug 2019 14:26:59 +0800 Message-Id: <20190821062659.2808-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=1566368848; bh=bFuayCWtGsDIaTo+0FSfFTvyIod2hR9wAqb05yuygjI=; h=Cc:Date:From:Reply-To:Subject:To; b=Eb8u5XVsE5IxYQDbjEY+XsxUIdhlSBmbzNWSzKK8dup1zG1MWkPBEZBz0WqLOVsYjJZ g5UQCD2YgJLnaq0sS3epS21Rw6b6kgg2rM4NH1wfRx2zuMAk0YADQDt5BbS0P+NpeEbWG jlBm9CWP1gCuLy9AgjaRyJjxpXRK+Z2ZrYo= 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 --- BaseTools/Source/Python/AutoGen/DataPipe.py | 2 +- BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 2 +- BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py | 4 +++- BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 3 ++- 4 files changed, 7 insertions(+), 4 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..cbbd550dbd 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 --=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 (#46133): https://edk2.groups.io/g/devel/message/46133 Mute This Topic: https://groups.io/mt/32975835/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-