From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (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 0CB93225FA07F for ; Tue, 10 Apr 2018 18:50:59 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Apr 2018 18:50:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,434,1517904000"; d="scan'208";a="42367207" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 10 Apr 2018 18:50:58 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 10 Apr 2018 18:50:57 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 10 Apr 2018 18:50:57 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.239]) by shsmsx102.ccr.corp.intel.com ([169.254.2.184]) with mapi id 14.03.0319.002; Wed, 11 Apr 2018 09:50:53 +0800 From: "Gao, Liming" To: Laszlo Ersek , "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fix the build error caused by eca980 Thread-Index: AQHT0M/SsU6fGiMF/US/SmNuGTS16KP5xIMAgAEI5FA= Date: Wed, 11 Apr 2018 01:50:54 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E20C2F2@SHSMSX104.ccr.corp.intel.com> References: <1523366885-6604-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the build error caused by eca980 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Apr 2018 01:50:59 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of La= szlo Ersek > Sent: Wednesday, April 11, 2018 2:03 AM > To: Zhu, Yonghong ; edk2-devel@lists.01.org > Subject: Re: [edk2] [Patch] BaseTools: Fix the build error caused by eca9= 80 >=20 > Hi Yonghong, >=20 > On 04/10/18 15:28, Yonghong Zhu wrote: > > Roll back the fixed at build pcd collection to include the pcd in > > Module and Library. > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Yonghong Zhu > > --- > > BaseTools/Source/Python/AutoGen/AutoGen.py | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Sou= rce/Python/AutoGen/AutoGen.py > > index 9280ae4..dbc9f89 100644 > > --- a/BaseTools/Source/Python/AutoGen/AutoGen.py > > +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py > > @@ -1277,11 +1277,11 @@ class PlatformAutoGen(AutoGen): > > def CollectFixedAtBuildPcds(self): > > for LibAuto in self.LibraryAutoGenList: > > FixedAtBuildPcds =3D {} > > ShareFixedAtBuildPcdsSameValue =3D {} > > for Module in LibAuto._ReferenceModules: > > - for Pcd in Module.FixedAtBuildPcds: > > + for Pcd in Module.FixedAtBuildPcds + LibAuto.FixedAtBu= ildPcds: > > key =3D ".".join((Pcd.TokenSpaceGuidCName,Pcd.Toke= nCName)) > > if key not in FixedAtBuildPcds: > > ShareFixedAtBuildPcdsSameValue[key] =3D True > > FixedAtBuildPcds[key] =3D Pcd.DefaultValue > > else: > > >=20 > this change fixes the ArmVirtQemu build error for me. >=20 > I suggest using commit hash abbreviations longer than just 6 nibbles. 12 > nibbles are more future proof (that size is used by the Linux kernel) > and it's also not a large burden to use. So, I suggest replacing > "eca980" in the subject line with "eca980c0c899". >=20 > With that change: >=20 > Tested-by: Laszlo Ersek >=20 > Thanks! > Laszlo > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel