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.24, mailfrom: zhijux.fan@intel.com) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by groups.io with SMTP; Thu, 25 Apr 2019 18:31:28 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 18:31:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,395,1549958400"; d="dat'59?scan'59,208,59";a="168043717" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga001.fm.intel.com with ESMTP; 25 Apr 2019 18:31:25 -0700 Received: from fmsmsx161.amr.corp.intel.com (10.18.125.9) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 25 Apr 2019 18:31:24 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX161.amr.corp.intel.com (10.18.125.9) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 25 Apr 2019 18:31:24 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.42]) with mapi id 14.03.0415.000; Fri, 26 Apr 2019 09:31:22 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH] BaseTools:Fixed an issue where the order of Guids changed in guid.xref Thread-Topic: [PATCH] BaseTools:Fixed an issue where the order of Guids changed in guid.xref Thread-Index: AdT7z27Xt93sAljaQMiqFviIVgbxeA== Date: Fri, 26 Apr 2019 01:31:21 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 39603 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D1A4SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D1A4SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Add content to dsc [PcdsPatchableInModule.common] gEfiMdeModulePkgTokenSpaceGuid.test1|FALSE Compare the 2 times build result,the order of file Guid.xref change The root cause is set() is used in Get all the PCDS the order of the data may change if set() is used This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/Workspace/DscBuildData.py | 20 ++++++++++---------= - 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/= Source/Python/Workspace/DscBuildData.py index 5431296b5a..1d7a6a11b8 100644 --- a/BaseTools/Source/Python/Workspace/DscBuildData.py +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py @@ -1632,7 +1632,7 @@ class DscBuildData(PlatformBuildClassObject): AvailableSkuIdSet =3D copy.copy(self.SkuIds) =20 PcdDict =3D tdict(True, 4) - PcdSet =3D set() + PcdList =3D [] # Find out all possible PCD candidates for self._Arch RecordList =3D self._RawData[Type, self._Arch] PcdValueDict =3D OrderedDict() @@ -1643,11 +1643,11 @@ class DscBuildData(PlatformBuildClassObject): EdkLogger.error('build ', PARAMETER_INVALID, 'Sku %s is no= t defined in [SkuIds] section' % SkuName, File=3Dself.MetaFile, Line=3DD= ummy5) if SkuName in (self.SkuIdMgr.SystemSkuId, TAB_DEFAULT, TAB_COM= MON): - if "." not in TokenSpaceGuid and "[" not in PcdCName: - PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, Dummy5)= ) + if "." not in TokenSpaceGuid and "[" not in PcdCName and (= PcdCName, TokenSpaceGuid, SkuName, Dummy5) not in PcdList: + PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dum= my5)) PcdDict[Arch, PcdCName, TokenSpaceGuid, SkuName] =3D Setti= ng =20 - for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdSet: + for PcdCName, TokenSpaceGuid, SkuName, Dummy4 in PcdList: Setting =3D PcdDict[self._Arch, PcdCName, TokenSpaceGuid, SkuN= ame] if Setting is None: continue @@ -2700,7 +2700,7 @@ class DscBuildData(PlatformBuildClassObject): if SkuName not in AvailableSkuIdSet: EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not= defined in [SkuIds] section' % SkuName, File=3Dself.MetaFile, Line=3DD= ummy5) - if "." not in TokenSpaceGuid and "[" not in PcdCName: + if "." not in TokenSpaceGuid and "[" not in PcdCName and (PcdC= Name, TokenSpaceGuid, SkuName, Dummy5) not in PcdList: PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy5)= ) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] =3D Setting =20 @@ -2852,7 +2852,7 @@ class DscBuildData(PlatformBuildClassObject): # PCD settings for certain ARCH and SKU # PcdDict =3D tdict(True, 5) - PcdSet =3D set() + PcdList =3D [] RecordList =3D self._RawData[Type, self._Arch] # Find out all possible PCD candidates for self._Arch AvailableSkuIdSet =3D copy.copy(self.SkuIds) @@ -2873,13 +2873,13 @@ class DscBuildData(PlatformBuildClassObject): if DefaultStore not in DefaultStoresDefine: EdkLogger.error('build', PARAMETER_INVALID, 'DefaultStores= %s is not defined in [DefaultStores] section' % DefaultStore, File=3Dself.MetaFile, Line=3DD= ummy5) - if "." not in TokenSpaceGuid and "[" not in PcdCName: - PcdSet.add((PcdCName, TokenSpaceGuid, SkuName, DefaultStor= e, Dummy5)) + if "." not in TokenSpaceGuid and "[" not in PcdCName and (PcdC= Name, TokenSpaceGuid, SkuName, DefaultStore, Dummy5) not in PcdList: + PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Default= Store, Dummy5)) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid, DefaultStore]= =3D Setting =20 =20 # Remove redundant PCD candidates, per the ARCH and SKU - for PcdCName, TokenSpaceGuid, SkuName, DefaultStore, Dummy4 in Pcd= Set: + for PcdCName, TokenSpaceGuid, SkuName, DefaultStore, Dummy4 in Pcd= List: =20 Setting =3D PcdDict[self._Arch, SkuName, PcdCName, TokenSpaceG= uid, DefaultStore] if Setting is None: @@ -3036,7 +3036,7 @@ class DscBuildData(PlatformBuildClassObject): if SkuName not in AvailableSkuIdSet: EdkLogger.error('build', PARAMETER_INVALID, 'Sku %s is not= defined in [SkuIds] section' % SkuName, File=3Dself.MetaFile, Line=3DD= ummy5) - if "." not in TokenSpaceGuid and "[" not in PcdCName: + if "." not in TokenSpaceGuid and "[" not in PcdCName and (PcdC= Name, TokenSpaceGuid, SkuName, Dummy5) not in PcdList: PcdList.append((PcdCName, TokenSpaceGuid, SkuName, Dummy5)= ) PcdDict[Arch, SkuName, PcdCName, TokenSpaceGuid] =3D Setting =20 --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D1A4SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" 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 tF+JFbWlLrFOAiA/kiemHyHiC4AKUFypMjf/HqBdkr61eB95L3o/vD+JSf+ZZWJPwp98H30rfg9/ H4Av/4E/gk/OT89fhX+Gj4eckrv/mP+aD5sfkiegq9RP1V/Wb/+cL7gfnk+fX83/ob+iz91f/6Tv 4G2nLOQ34p8nFaofZUf9vnM4DrC+8+tkv6/Av8HP/2u9bgISAenibtQnIAAgC3ERIZBSQ0jak1NL Vf/vT3OfZn9ngtLvaN9p72r//3BfcW9yf/nfbI9tn26vb7+vxP9jT2Re6xQ3dzEz67K/BmTsT+1f 7m/lfzNxRMtguy5gKwBTGJHEdwvKcwvB/yLhCk/HL8g/yU998A0Lyq//y7QNC8x7C8rNvxg/GU/Q 7//R/9MP2K/Zv9rPkf+TT5Rf/+M/5EcWipbvHQ8eHx8v20//3F8kTyVf3q+f3+DP4d8sH/8tLy4/ 5T/mT+dfMz803Ol/x2VI/a/60W1vditQdcH+dSoAQBB1QAAsSBD8sLDg/1rAK1Dx/6ufOS8z/zUP rv//sA9C30PvRP+zbzy/tQ+2H384L0hfOk+5f7qPu5xdEjP4MDM2XZJWFQdfCG8Jf/9TL8PvAu/f /w8/EE8RX8pP/8tfzG/Nf2XfZu8aLxs/HE//J78ozynf1w9q72v/bQ8qn/8rr0kfLq9LzzDPMd9z /3UP/zXvNv84D3oP6R+qziGAfKWQMi4xNIMgLnf+0Thvd3ODIHylfKV9fQN3wIUwHwBCAAEAAAAY AAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEA bgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoAAABTAE0AVABQAAAAAAACAUEAAQAA AGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0A VABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwACXQEAAAAq AAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVfAQAAADIA AABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAa DAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAfDAEAAAAqAAAAegBoAGkAagB1AHgA LgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4MAQAAAAoAAABTAE0AVABQAAAAAAAC ARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgA AABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwAB XQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAPg/ AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBqAHUAeAAu AGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAAAAAAAAIB +T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBqAHUAWAAA AFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAfAAld AQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAAsAQDoB AAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAAAwD9P+QE AAACAQswAQAAABAAAAAjZJSYhsacR73OflVpOTU/AwAXAAEAAABAADkAgLqtwM/71AFAAAgwi3wm wc/71AEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4AZwB1AGEA ZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAAngAAAFsAUABBAFQAQwBIAF0AIABC AGEAcwBlAFQAbwBvAGwAcwA6AEYAaQB4AGUAZAAgAGEAbgAgAGkAcwBzAHUAZQAgAHcAaABlAHIA ZQAgAHQAaABlACAAbwByAGQAZQByACAAbwBmACAARwB1AGkAZABzACAAYwBoAGEAbgBnAGUAZAAg AGkAbgAgAGcAdQBpAGQALgB4AHIAZQBmAAAAAAAfAD0AAQAAAAIAAAAAAAAAAwA2AAAAAAACAXEA AQAAABYAAAAB1PvPbte33ewCWNpAyKoW+IhWBvF4AAAfAHAAAQAAAJ4AAABbAFAAQQBUAEMASABd ACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBGAGkAeABlAGQAIABhAG4AIABpAHMAcwB1AGUAIAB3AGgA ZQByAGUAIAB0AGgAZQAgAG8AcgBkAGUAcgAgAG8AZgAgAEcAdQBpAGQAcwAgAGMAaABhAG4AZwBl AGQAIABpAG4AIABnAHUAaQBkAC4AeAByAGUAZgAAAAAAHwA1EAEAAACQAAAAPABGAEEARAAwAEQA NwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcAMgA0ADMANQBDAEEARgBEADUAMABB AEYANABEADEAQQA0AEAAUwBIAFMATQBTAFgAMQAwADEALgBjAGMAcgAuAGMAbwByAHAALgBpAG4A dABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwx7khwc/71AECAQsAAQAAABAAAAAjZJSYhsac R73OflVpOTU/AwAmAAAAAAACAUcAAQAAADMAAABjPVVTO2E9TUNJO3A9SW50ZWw7bD1TSFNNU1gx MDEtMTkwNDI2MDEzMTIxWi0yNDE0NwAAAgEQMAEAAABGAAAAAAAAACZ3vTk77DhJpKYVPcule0IH APrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT60eaTGQAAAlUj1YAAAAAHwD6PwEA AAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEAAABAAACACCAGAAAAAADAAAAAAAAA RgAAAAC/hQAAwIcUwM/71AELAACACCAGAAAAAADAAAAAAAAARgAAAACChQAAAAAAAAMAAIAIIAYA AAAAAMAAAAAAAABGAAAAAOuFAAAJBAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAGAAAAGQAbABw AC0AcAByAG8AZAB1AGMAdAAAAAEAAAAaAAAAZABsAHAAZQAtAHcAaQBuAGQAbwB3AHMAAAAAAB8A AICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHYAZQByAHMAaQBvAG4AAAABAAAAFgAA ADEAMQAuADAALgA2ADAAMAAuADcAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABoAAABkAGwA cAAtAHIAZQBhAGMAdABpAG8AbgAAAAAAAQAAABQAAABuAG8ALQBhAGMAdABpAG8AbgAAAAMADTT9 PwAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIAAAAHgALQBtAHMALQBoAGEAcwAtAGEAdAB0AGEA YwBoAAAAAQAAAAIAAAAAAAAAHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAIgAAAHgALQBvAHIAaQBn AGkAbgBhAHQAaQBuAGcALQBpAHAAAAAAAAEAAAAgAAAAWwAxADAALgAyADMAOQAuADEAMgA3AC4A NAAwAF0AAAAtng== --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D1A4SHSMSX101ccrcor_--