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.65, mailfrom: zhijux.fan@intel.com) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Thu, 25 Apr 2019 19:30:03 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 19:30:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,395,1549958400"; d="dat'59?scan'59,208,59";a="145831241" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 25 Apr 2019 19:30:02 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 25 Apr 2019 19:30:01 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.21]) with mapi id 14.03.0415.000; Fri, 26 Apr 2019 10:29:59 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH V2] BaseTools:Fixed an issue where the order of GuidS changed in guid.xref Thread-Topic: [PATCH V2] BaseTools:Fixed an issue where the order of GuidS changed in guid.xref Thread-Index: AdT71++s99QyUzYwT7qimIu5Qm4uQg== Date: Fri, 26 Apr 2019 02:29:58 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 39608 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D22ESHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D22ESHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1749 Add content to dsc [PcdsPatchableInModule.common] gEfiMdeModulePkgTokenSpaceGuid.test1|FALSE The order of file Guid.xref will change after increment build. 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_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D22ESHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IioAAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADhBODIxMzlB RkM1MjIwNEY5QkIyOTRFQTQyMDk3QjAyABkHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBAAaAAIA HQA6AAUAZgEBIIADAA4AAADjBwQAGgACAB0AOgAFAGYBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAFIAAABbUEFUQ0ggVjJdIEJhc2VUb29sczpGaXhlZCBhbiBpc3N1ZSB3 aGVyZSB0aGUgb3JkZXIgb2YgR3VpZFMgY2hhbmdlZCBpbiBndWlkLnhyZWYANBwBC4ABACEAAAA4 QTgyMTM5QUZDNTIyMDRGOUJCMjk0RUE0MjA5N0IwMgAZBwEDkAYA0BAAADAAAAACAX8AAQAAAEgA AAA8RkFEMEQ3RTBBRTBGQTU0RDk4N0Y2RTcyNDM1Q0FGRDUwQUY0RDIyRUBTSFNNU1gxMDEuY2Ny LmNvcnAuaW50ZWwuY29tPgALAB8OAQAAAAIBCRABAAAA2QcAANUHAADJFwAATFpGdQuaTpJhAApm YmlkBAAAY2PAcGcxMjUyAP4DQ/B0ZXh0AfcCpAPjAgAEY2gKwHNldDAg7wdtAoMAUBFNMgqABrQC gJZ9CoAIyDsJYjE5DsC/CcMWcgoyFnECgBViKgmwcwnwBJBhdAWyDlADYHOibwGAIEV4EcFuGDBd BlJ2BJAXtgIQcgDAdH0IUG4aMRAgBcAFoBtkZJogA1IgECIXslx2CJDkd2sLgGQ1HVME8AdADRdw MApxF/Jia21rBnMBkAAgIEJNX0LgRUdJTn0K/AHxC/IKbAuAZQqAQlo6aAECQHBzOi8vYnVMZ3oD EAtgLnQHMG4SbwWhZS4FsGcvcxBob3dfIrEuY2cEaT8N0D0xNzQ58yGVIZVBZBxgG+EQIAIwMRzA byBkBPAhlVtQOmMnMFAYgBHBAmBlSfRuTQRwdR5wJKADcARgBG5dIZUgIGdFZgxpTQEAKNRQa2dU FG9rCfBTCrBjZUcOdQ3QIzAHkHQxfEaQQUxTRSVsVGgZ4PcFsASBLfBmHHADEBngK+N+eAlwLnAD 8CMAG9AZpGHvAYAbsQuABQBlB4Am0SKwbwMQLBAtWQNgbwVAHlB1zxIAMJAEIBIBKCky8jLBvxxg C4Au0BIQMDAvoXQt0fBQQ0RTIZU0wi4HNMLSZBiAYSAAwHkvxgaQPzMsLO4zAQqwKEEy8mdv7QuA ZybyKmB4NLEYgDLxjnMKUDGWIZVDYzofsLBvYiBGCfA6wDwG4NJiJKAuZj1xQAuAECBqbCkyPjx5 TAdwOqJHmmEnEDwhoD/iLmdAQJM+bxTAaWcYUGQtGTBQZi1ieT0AWjmwakh1LkYDkTx6Q0J4Zz4Q AHBBLwotRaAptkKOYRIAK0AG8HMvUwhhMSvAL1B5NMACIC9XpwWwH1Aroi9EBPBCMVKSRDbRLnA3 MHwgAdC8ICtJx0WhSmUptjEuhPkZlGQsS3ASMAuAEgAAIMJpAiBzKCspTGMBAHMecE0ELSklbA3g ASAgd0WgJMA0YS9GX0dvSH5iP1A/UU9SXiGVHbEQMCA1hDQzDpA5NmI1IyAALjFkN2E2YTEIMWI4 THEwNjQ0/0U4UB9Ub1V/VoZJwVNfWu8TW/9WhkBAT7AxNjO4Miw3SbBhpWFhYwtg8wQRSHooUAtg ADAa8UijIkNi0k9iagWQdCnmOim3ZgVBdgtwC2AogWBTa3VJZAZgBUA9LxvRSUApMUlAKBIAbGZ6 Lmcjc06GAzBlrSfhRBsOUGeSdA3gZVAoVHL7ClBMYDROhlnAakhndDMz310Wajk/wB9gZ6FbKahm Ba4jPVAdsS3wdTRkcBkQ/wCQKIE08jKRHcAN0BiAB5F3GuEzIWiRXwcQEcBlnlJHBZJvNnOEUmF3 SPJbeFR5cGvhc4hvzyfhVvcHQApQauVPLhIJgGribff7YWRXcCxYgGICe3Rin2OvB2S/ZctmBkVk a0xvMmcYMHIuBJADYHIoEicxQyAnTGBQQVKAQU1FVEVSXyAgUlYsoElETGAnZyEg/iUEIDMBI3AF QAEBIbEz87pbaMRdMyF/IE0RJ4Pw0wYAZzBOYQeALH9viB9XiS9w4R5wPWhzTRIQYY+KUkxgP8AY UD1EdSlg/Hk1aSeJSjfBhpU0Amhp9k0JwGiweR9gMOBnI0xgQFRBQl9ERSyQVQRMVJAUQ09NTU+O Tn9HbKeNGSIuIoRTzzQRK0wwMHERIluTlyfhnkOGwpG/l0ptNC5hJlD+KH2wlhWQEStbTGCGlnzg /4v0bg+Sz5PflO+V958DmQ//mh+bJ5WJb0J/Vpw/btmYsP5wdvAdwJj/od+bH4d/aqb+W3PigmGn X6hthcBnsGdx/yNAGcBpPWync0KsX6hfmzT+NJXFZ3Gkf7Cfsa+yv6Qr/6prrqVnoat2c4isP7ZP rlDvuK+NZbn1MwFOAiCWd6pvzyaCC4AKUGD5MjceoGHi/8MFfG99f36PwI+NmZ21Zp//xu+Ab4F7 gl+Db4R/hY+Gn//Sn9Ovic+K34vslwudT55f/59vlnek+9if2a/av6B/vG//op+jr9JPpg+nH+Gv qT/kvX+rfOiH5u8rta5vaZfCwzj/DrDDQ++0w//FD8YfcA1yUn8SAe4ycyQrwAAgC3HJQFLEQ0je 41NLVfOfd+//as9r0tc/bS9uP29PdK91v/92z/4vcN9x73L/dA/JT2ef62iu72Q3e4Ez8AIKtPCf b/Gv8r/pzzfBRM+wMrBs3HRTGJHIxxAacxARIbH/Dp/Lf8yPzZ+CQBFbzv/QBP8RW9DLEBrSDxyP HZ/VP9ZP/9df3P/eD98flk+Xn5iv54//6Jca2ps/IV8ibyN/35/gr/8onymv4v+kL+Uf5i8wbzF/ /zKP6Y/qn+uvN485LO3PaZhjAf//IW1vdi+gehF1/y5QRGB5kAR8TGABALUwXxD/L6D2T6/vPX84 Tzlfs0+0X/9HL0g/SU+3v0EPuV+6bzx/P0yvPp+9z77fv+xhYjMw/DM2YeJaZQuvDL8Nz1d//8g/ Bz/kTxOPFJ8Vr86fz6//0L/Rz2ovaz8efx+PIJ8sD/8tHy4v219vP3BPcV8u7y///01vMv9QHzUf Ni94T3lfOj9/O088X35f7W+vHvsAgPUySC4xNIdwLncDIW+cd3OHcID1gPV9fXwQAYmAAAAAHwBC AAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwBlAAEAAAAqAAAAegBoAGkAagB1AHgA LgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAGQAAQAAAAoAAABTAE0AVABQAAAAAAAC AUEAAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgA AABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwAC XQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAOVf AQAAADIAAABzAGkAcAA6AHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAA AAAAHwAaDAEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAfDAEAAAAqAAAAegBoAGkA agB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfAB4MAQAAAAoAAABTAE0AVABQ AAAAAAACARkMAQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAsACAAWgBoAGkA agB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBt AAAAHwABXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAAfAPg/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAAfACNAAQAAACoAAAB6AGgAaQBq AHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AIkABAAAACgAAAFMATQBUAFAA AAAAAAIB+T8BAAAAZAAAAAAAAACBKx+kvqMQGZ1uAN0BD1QCAAAAgEYAYQBuACwAIABaAGgAaQBq AHUAWAAAAFMATQBUAFAAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0A AAAfAAldAQAAACoAAAB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAA AAsAQDoBAAAAHwAaAAEAAAASAAAASQBQAE0ALgBOAG8AdABlAAAAAAADAPE/CQQAAAsAQDoBAAAA AwD9P+QEAAACAQswAQAAABAAAACKghOa/FIgT5uylOpCCXsCAwAXAAEAAABAADkAAFf58Nf71AFA AAgwr5xw8df71AEfAACAhgMCAAAAAADAAAAAAAAARgEAAAAeAAAAYQBjAGMAZQBwAHQAbABhAG4A ZwB1AGEAZwBlAAAAAAABAAAADAAAAGUAbgAtAFUAUwAAAB8ANwABAAAApAAAAFsAUABBAFQAQwBI ACAAVgAyAF0AIABCAGEAcwBlAFQAbwBvAGwAcwA6AEYAaQB4AGUAZAAgAGEAbgAgAGkAcwBzAHUA ZQAgAHcAaABlAHIAZQAgAHQAaABlACAAbwByAGQAZQByACAAbwBmACAARwB1AGkAZABTACAAYwBo AGEAbgBnAGUAZAAgAGkAbgAgAGcAdQBpAGQALgB4AHIAZQBmAAAAHwA9AAEAAAACAAAAAAAAAAMA NgAAAAAAAgFxAAEAAAAWAAAAAdT71++s99QyUzYwT7qimIu5Qm4uQgAAHwBwAAEAAACkAAAAWwBQ AEEAVABDAEgAIABWADIAXQAgAEIAYQBzAGUAVABvAG8AbABzADoARgBpAHgAZQBkACAAYQBuACAA aQBzAHMAdQBlACAAdwBoAGUAcgBlACAAdABoAGUAIABvAHIAZABlAHIAIABvAGYAIABHAHUAaQBk AFMAIABjAGgAYQBuAGcAZQBkACAAaQBuACAAZwB1AGkAZAAuAHgAcgBlAGYAAAAfADUQAQAAAJAA AAA8AEYAQQBEADAARAA3AEUAMABBAEUAMABGAEEANQA0AEQAOQA4ADcARgA2AEUANwAyADQAMwA1 AEMAQQBGAEQANQAwAEEARgA0AEQAMgAyAEUAQABTAEgAUwBNAFMAWAAxADAAMQAuAGMAYwByAC4A YwBvAHIAcAAuAGkAbgB0AGUAbAAuAGMAbwBtAD4AAAADAN4/n04AAEAABzBNO27x1/vUAQIBCwAB AAAAEAAAAIqCE5r8UiBPm7KU6kIJewIDACYAAAAAAAIBRwABAAAAMwAAAGM9VVM7YT1NQ0k7cD1J bnRlbDtsPVNIU01TWDEwMS0xOTA0MjYwMjI5NThaLTI0Mjc3AAACARAwAQAAAEYAAAAAAAAAJne9 OTvsOEmkphU9y6V7QgcA+tDX4K4PpU2Yf25yQ1yv1QAAAEQRXgAAppNoNoh2bEunStPrR5pMZAAK tJoEAQAAAAAfAPo/AQAAABgAAABGAGEAbgAsACAAWgBoAGkAagB1AFgAAAADAAlZAQAAAAsAAIAI IAYAAAAAAMAAAAAAAABGAAAAAIKFAAAAAAAAAwAAgAggBgAAAAAAwAAAAAAAAEYAAAAA64UAAAkE AAADAA00/T8AAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACAAAAB4AC0AbQBzAC0AaABhAHMALQBh AHQAdABhAGMAaAAAAAEAAAACAAAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACIAAAB4AC0A bwByAGkAZwBpAG4AYQB0AGkAbgBnAC0AaQBwAAAAAAABAAAAIAAAAFsAMQAwAC4AMgAzADkALgAx ADIANwAuADQAMABdAAAA6JE= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF4D22ESHSMSX101ccrcor_--