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.20, mailfrom: zhijux.fan@intel.com) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by groups.io with SMTP; Thu, 19 Sep 2019 02:04:34 -0700 X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2019 02:04:33 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,523,1559545200"; d="dat'59?scan'59,208,59";a="181410794" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga008.jf.intel.com with ESMTP; 19 Sep 2019 02:04:33 -0700 Received: from fmsmsx152.amr.corp.intel.com (10.18.125.5) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 02:04:32 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by FMSMSX152.amr.corp.intel.com (10.18.125.5) with Microsoft SMTP Server (TLS) id 14.3.439.0; Thu, 19 Sep 2019 02:04:32 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.92]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.86]) with mapi id 14.03.0439.000; Thu, 19 Sep 2019 17:04:30 +0800 From: "Fan, ZhijuX" To: "devel@edk2.groups.io" CC: "Gao, Liming" , "Feng, Bob C" Subject: [PATCH V2] BaseTools:Fix the issue that build report failed Thread-Topic: [PATCH V2] BaseTools:Fix the issue that build report failed Thread-Index: AdVuyTWCzv0heTWOQ46WXN97ptp/uQ== Date: Thu, 19 Sep 2019 09:04:29 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: zhijux.fan@intel.com X-Groupsio-MsgNum: 47573 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC6DSHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC6DSHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2201 An error occurs using special VpdPcd that is not used in the Inf file In dsc: [PcdsDynamicExVpd.common.DEFAULT] gBoardModuleTokenSpaceGuid.test1|*|{CODE({ {0x0} // terminator })} In dec: [PcdsDynamicEx] # Vpd GPIO table gBoardModuleTokenSpaceGuid.test1|{0}|GPIO_INIT_CONFIG[]|0x50000018 { Library/GpioLib.h MdePkg/MdePkg.dec } ValueError: invalid literal for int() with base 0: '*' This Patch is going to fix issue Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- Old title:Change the way that get some VpdPcd information=20 BaseTools/Source/Python/build/BuildReport.py | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index 6b26f1c3b0..880459d367 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1419,10 +1419,19 @@ class PcdReport(object): FileWrite(File, '%*s' % (self.MaxLen + 4, SkuInfo.= VpdOffset)) VPDPcdItem =3D (Pcd.TokenSpaceGuidCName + '.' + Pc= dTokenCName, SkuIdName, SkuInfo.VpdOffset, Pcd.MaxDatumSize, SkuInfo.Defaul= tValue) if VPDPcdItem not in VPDPcdList: - VPDPcdList.append(VPDPcdItem) + PcdGuidList =3D self.UnusedPcds.get(Pcd.TokenS= paceGuidCName) + if PcdGuidList: + PcdList =3D PcdGuidList.get(Pcd.Type) + if not PcdList: + VPDPcdList.append(VPDPcdItem) + for VpdPcd in PcdList: + if PcdTokenCName =3D=3D VpdPcd.TokenCN= ame: + break + else: + VPDPcdList.append(VPDPcdItem) if IsStructure: FiledOverrideFlag =3D False - OverrideValues =3D Pcd.SkuOverrideValues[Sku] + OverrideValues =3D Pcd.SkuOverrideValues.get(Sku) if OverrideValues: Keys =3D list(OverrideValues.keys()) OverrideFieldStruct =3D self.OverrideFieldValu= e(Pcd, OverrideValues[Keys[0]]) --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC6DSHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" 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 i7O/htVJc/BTdHJ1dOAIcLHnt0/fdqp6YBoxBRABAEYLYCcg/32gUeCxwYkfvc27lkQTBCDtmTMu gXG+3FuBcS32sn//vl+/b8OqkTOBcbaPt18p0I/DjLk/yo8+0UtlecRS+yUQH2AoxQ05cMvwRkDG b+/O78NZPgBNEGS4pJAW0DsfRBORcl5wwF3L0lswXc5dYIZrESUFMi5yYNYA/i4D8B3AI+CRICT9 FULYEAAAAB8AQgABAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AZQABAAAAKgAAAHoA aABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwBkAAEAAAAKAAAAUwBN AFQAUAAAAAAAAgFBAAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4ALAAgAFoA aABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBj AG8AbQAAAB8AAl0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8A bQAAAAAAHwDlXwEAAAAyAAAAcwBpAHAAOgB6AGgAaQBqAHUAeAAuAGYAYQBuAEAAaQBuAHQAZQBs AC4AYwBvAG0AAAAAAB8AGgwBAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8AHwwBAAAA KgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwAeDAEAAAAK AAAAUwBNAFQAUAAAAAAAAgEZDAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACARgBhAG4A LAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABl AGwALgBjAG8AbQAAAB8AAV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwA LgBjAG8AbQAAAAAAHwD4PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAHwAjQAEAAAAq AAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAAAAfACJAAQAAAAoA AABTAE0AVABQAAAAAAACAfk/AQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9UAgAAAIBGAGEAbgAs ACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUA bAAuAGMAbwBtAAAAHwAJXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAu AGMAbwBtAAAAAAALAEA6AQAAAB8AGgABAAAAEgAAAEkAUABNAC4ATgBvAHQAZQAAAAAAAwDxPwkE AAALAEA6AQAAAAMA/T/kBAAAAgELMAEAAAAQAAAAn80nQ8yAbEqvTHxizcREggMAFwABAAAAQAA5 AIDMTD7JbtUBQAAIMMLZ5D7JbtUBHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAAHgAAAGEAYwBjAGUA cAB0AGwAYQBuAGcAdQBhAGcAZQAAAAAAAQAAAAwAAABlAG4ALQBVAFMAAAAfADcAAQAAAHgAAABb AFAAQQBUAEMASAAgAFYAMgBdACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBGAGkAeAAgAHQAaABlACAA aQBzAHMAdQBlACAAdABoAGEAdAAgAGIAdQBpAGwAZAAgAHIAZQBwAG8AcgB0ACAAZgBhAGkAbABl AGQAAAAfAD0AAQAAAAIAAAAAAAAAAwA2AAAAAAACAXEAAQAAABYAAAAB1W7JNYLO/SF5NY5DjpZc 33um2n+5AAAfAHAAAQAAAHgAAABbAFAAQQBUAEMASAAgAFYAMgBdACAAQgBhAHMAZQBUAG8AbwBs AHMAOgBGAGkAeAAgAHQAaABlACAAaQBzAHMAdQBlACAAdABoAGEAdAAgAGIAdQBpAGwAZAAgAHIA ZQBwAG8AcgB0ACAAZgBhAGkAbABlAGQAAAAfADUQAQAAAJAAAAA8AEYAQQBEADAARAA3AEUAMABB AEUAMABGAEEANQA0AEQAOQA4ADcARgA2AEUANwAyADQAMwA1AEMAQQBGAEQANQAwAEEARgBCAEQA QwA2AEQAQABTAEgAUwBNAFMAWAAxADAAMQAuAGMAYwByAC4AYwBvAHIAcAAuAGkAbgB0AGUAbAAu AGMAbwBtAD4AAAADAN4/n04AAEAABzBgeOI+yW7VAQIBCwABAAAAEAAAAJ/NJ0PMgGxKr0x8Ys3E RIIDACYAAAAAAAIBRwABAAAAMwAAAGM9VVM7YT1NQ0k7cD1JbnRlbDtsPVNIU01TWDEwMS0xOTA5 MTkwOTA0MjlaLTE0OTk1AAACARAwAQAAAEYAAAAAAAAAJne9OTvsOEmkphU9y6V7QgcA+tDX4K4P pU2Yf25yQ1yv1QAAAEQRXgAAppNoNoh2bEunStPrR5pMZAAACVTAEQAAAAAfAPo/AQAAABgAAABG AGEAbgAsACAAWgBoAGkAagB1AFgAAAADAAlZAQAAAEAAAIAIIAYAAAAAAMAAAAAAAABGAAAAAL+F AADgFyk+yW7VAQsAAIAIIAYAAAAAAMAAAAAAAABGAAAAAIKFAAAAAAAAAwAAgAggBgAAAAAAwAAA AAAAAEYAAAAA64UAAAkEAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAYAAAAZABsAHAALQBwAHIA bwBkAHUAYwB0AAAAAQAAABoAAABkAGwAcABlAC0AdwBpAG4AZABvAHcAcwAAAAAAHwAAgIYDAgAA AAAAwAAAAAAAAEYBAAAAGAAAAGQAbABwAC0AdgBlAHIAcwBpAG8AbgAAAAEAAAASAAAAMQAxAC4A MgAuADAALgA2AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBj AHQAaQBvAG4AAAAAAAEAAAAUAAAAbgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIA AAAAAMAAAAAAAABGAQAAACAAAAB4AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAAC AAAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkA bgBnAC0AaQBwAAAAAAABAAAAIAAAAFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAYL4= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AFBDC6DSHSMSX101ccrcor_--