From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.100; helo=mga07.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 96332211CBD0F for ; Thu, 21 Feb 2019 23:27:24 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Feb 2019 23:27:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,398,1544515200"; d="scan'208";a="124349213" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga007.fm.intel.com with ESMTP; 21 Feb 2019 23:27:23 -0800 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 21 Feb 2019 23:27:23 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.102]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.232]) with mapi id 14.03.0415.000; Fri, 22 Feb 2019 15:27:21 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [Patch] BaseTools: Fix a bug about Structure PCD Thread-Index: AQHUyFc2bnD3UEurF02BTMUJBR3/AqXrb2Jw Date: Fri, 22 Feb 2019 07:27:20 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3E5E38@SHSMSX104.ccr.corp.intel.com> References: <20190219132949.13740-1-bob.c.feng@intel.com> In-Reply-To: <20190219132949.13740-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix a bug about Structure PCD X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Feb 2019 07:27:24 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao >-----Original Message----- >From: Feng, Bob C >Sent: Tuesday, February 19, 2019 9:30 PM >To: edk2-devel@lists.01.org >Cc: Feng, Bob C ; Gao, Liming >Subject: [Patch] BaseTools: Fix a bug about Structure PCD > >BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1535 >If there is Hii Structure Pcd, build will fail, root cause is that >there is an incorrect variable access method used in code. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/Workspace/DscBuildData.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index e45beb3924..2e6eb16b08 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -2392,11 +2392,11 @@ class DscBuildData(PlatformBuildClassObject): > skuinfo =3D Pcd.SkuInfoList[skuname] > if skuinfo.VariableName: > for defaultstore in skuinfo.DefaultStoreDict: > pcddscrawdefaultvalue =3D self.GetPcdDscRawDefaul= tValue(Pcd, >skuname, defaultstore) > if pcddscrawdefaultvalue: >- Value =3D skuinfo[defaultstore] >+ Value =3D skuinfo.DefaultStoreDict[defaultsto= re] > if "{CODE(" in Value: > realvalue =3D Value.strip()[6:-2] # "{COD= E(").rstrip(")}" > CApp +=3D "static %s %s_%s_%s_%s_Value%s = =3D %s;\n" % >(Pcd.BaseDatumType,Pcd.TokenSpaceGuidCName,Pcd.TokenCName,skunam >e,defaultstore,Demesion,realvalue) > else: > pcddscrawdefaultvalue =3D self.GetPcdDscRawDefaultVal= ue(Pcd, >skuname, TAB_DEFAULT_STORES_DEFAULT) >-- >2.20.1.windows.1