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.126; helo=mga18.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 1B9DA203B99C2 for ; Mon, 16 Jul 2018 02:48:17 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jul 2018 02:48:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,360,1526367600"; d="scan'208";a="71729139" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by fmsmga004.fm.intel.com with ESMTP; 16 Jul 2018 02:47:28 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 16 Jul 2018 02:47:28 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 16 Jul 2018 02:47:28 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.81]) by shsmsx102.ccr.corp.intel.com ([169.254.2.124]) with mapi id 14.03.0319.002; Mon, 16 Jul 2018 17:47:26 +0800 From: "Gao, Liming" To: "Feng, Bob C" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fixed build Ovmfpkg failed issue. Thread-Index: AQHUHOjbNv1NxHlLjUGmJh+BOP0DtKSRme2A Date: Mon, 16 Jul 2018 09:47:26 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E2BC176@SHSMSX104.ccr.corp.intel.com> References: <20180716093844.199568-1-bob.c.feng@intel.com> In-Reply-To: <20180716093844.199568-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: Fixed build Ovmfpkg failed issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jul 2018 09:48:17 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This patch fixes the regression issues caused by 543f5ac30facfbb40eafb2b490= 8649a427784080.=20 Without this fix, OvmfPkg will build failure.=20 Thanks Liming >-----Original Message----- >From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of >BobCF >Sent: Monday, July 16, 2018 5:39 PM >To: edk2-devel@lists.01.org >Cc: Gao, Liming >Subject: [edk2] [Patch] BaseTools: Fixed build Ovmfpkg failed issue. > >Fixed a code bug. > >Contributed-under: TianoCore Contribution Agreement 1.1 >Signed-off-by: Bob Feng >Cc: Liming Gao >--- > BaseTools/Source/Python/Workspace/DscBuildData.py | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > >diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py >b/BaseTools/Source/Python/Workspace/DscBuildData.py >index 804eafa619..e8b36a3868 100644 >--- a/BaseTools/Source/Python/Workspace/DscBuildData.py >+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py >@@ -1293,14 +1293,14 @@ class DscBuildData(PlatformBuildClassObject): > def OverrideByFdfOverAll(self,AllPcds): > > if GlobalData.gFdfParser is None: > return AllPcds > NoFiledValues =3D GlobalData.gFdfParser.Profile.PcdDict >- for Guid,Name,Field in NoFiledValues: >+ for Name,Guid,Field in NoFiledValues: > if len(Field): > continue >- Value =3D NoFiledValues[(Guid,Name,Field)] >+ Value =3D NoFiledValues[(Name,Guid,Field)] > if (Name,Guid) in AllPcds: > Pcd =3D AllPcds.get((Name,Guid)) > if >isinstance(self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName), >None),StructurePcd): > >self._DecPcds.get((Pcd.TokenCName,Pcd.TokenSpaceGuidCName)).PcdValu >eFromComm =3D Value > else: >@@ -1323,11 +1323,11 @@ class DscBuildData(PlatformBuildClassObject): > MaxSize =3D max(CurrentSize, OptionSize) > Pcd.MaxDatumSize =3D str(MaxSize) > else: > PcdInDec =3D self.DecPcds.get((Name,Guid)) > if PcdInDec: >- PcdInDec.PcdValueFromComm =3D Value >+ PcdInDec.PcdValueFromFdf =3D Value > if PcdInDec.Type in >[self._PCD_TYPE_STRING_[MODEL_PCD_FIXED_AT_BUILD], > >self._PCD_TYPE_STRING_[MODEL_PCD_PATCHABLE_IN_MODULE], > >self._PCD_TYPE_STRING_[MODEL_PCD_FEATURE_FLAG]]: > self.Pcds[Name, Guid] =3D copy.deepcopy(PcdInDec) > self.Pcds[Name, Guid].DefaultValue =3D Value >-- >2.16.2.windows.1 > >_______________________________________________ >edk2-devel mailing list >edk2-devel@lists.01.org >https://lists.01.org/mailman/listinfo/edk2-devel