From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.243])
 by mx.groups.io with SMTP id smtpd.web10.31470.1599439210784111038
 for <devel@edk2.groups.io>;
 Sun, 06 Sep 2020 17:40:11 -0700
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.243, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <bob.c.feng@intel.com>; Mon, 07 Sep 2020 08:40:08 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: "'Bob Feng'" <bob.c.feng@intel.com>,
	<devel@edk2.groups.io>
Cc: "'Yuwei Chen'" <yuwei.chen@intel.com>
References: <20200904143028.41796-1-bob.c.feng@intel.com>
In-Reply-To: <20200904143028.41796-1-bob.c.feng@intel.com>
Subject: =?UTF-8?B?5Zue5aSNOiBbUGF0Y2hdIEJhc2VUb29sczogU29ydCB0aGUgUGNkIHNldCB3aGVuIGdlbmVyYXRpbmcgdGhlIFZQRCBiaW5hcnk=?=
Date: Mon, 7 Sep 2020 08:40:08 +0800
Message-ID: <000b01d684af$6fb674e0$4f235ea0$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQDzdQceGp+ZMXj+XA6L+n8OZPpGbqsidM1Q
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: Bob Feng <bob.c.feng@intel.com>
> =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA9=D4=C24=C8=D5 22:30
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> =B3=AD=CB=CD: Liming Gao <gaoliming@byosoft.com.cn>; Yuwei Chen
> <yuwei.chen@intel.com>
> =D6=F7=CC=E2: [Patch] BaseTools: Sort the Pcd set when generating the =
VPD binary
>=20
> If VPD PcdNvStoreDefaultValueBuffer is used, all DynamicHii and
> DynamicExHii PCD value will be generated into that VPD.
>=20
> In order to generate the same VPD binary file in every build,
> sort the Pcd set when generating VPD.
>=20
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/PlatformAutoGen.py | 2 +-
>  BaseTools/Source/Python/Workspace/DscBuildData.py  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>=20
> diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> index af66c48c7d..26ab8e7f36 100644
> --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> @@ -251,11 +251,11 @@ class PlatformAutoGen(AutoGen):
>=20
>          VariableInfo =3D
> VariableMgr(self.DscBuildDataObj._GetDefaultStores(),
> self.DscBuildDataObj.SkuIds)
>          VariableInfo.SetVpdRegionMaxSize(VpdRegionSize)
>          VariableInfo.SetVpdRegionOffset(VpdRegionBase)
>          Index =3D 0
> -        for Pcd in DynamicPcdSet:
> +        for Pcd in sorted(DynamicPcdSet):
>              pcdname =3D ".".join((Pcd.TokenSpaceGuidCName,
> Pcd.TokenCName))
>              for SkuName in Pcd.SkuInfoList:
>                  Sku =3D Pcd.SkuInfoList[SkuName]
>                  SkuId =3D Sku.SkuId
>                  if SkuId is None or SkuId =3D=3D '':
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
> b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index 1afbd3eefc..4a128c8a77 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -2582,11 +2582,11 @@ class DscBuildData(PlatformBuildClassObject):
>                      IncludeFiles.add(IncludeFile)
>                      CApp =3D CApp + '#include <%s>\n' % (IncludeFile)
>          CApp =3D CApp + '\n'
>          for Pcd in StructuredPcds.values():
>              CApp =3D CApp + self.GenerateArrayAssignment(Pcd)
> -        for PcdName in StructuredPcds:
> +        for PcdName in sorted(StructuredPcds.keys()):
>              Pcd =3D StructuredPcds[PcdName]
>              CApp =3D CApp + self.GenerateSizeFunction(Pcd)
>              CApp =3D CApp + =
self.GenerateDefaultValueAssignFunction(Pcd)
>              CApp =3D CApp + self.GenerateFdfValue(Pcd)
>              CApp =3D CApp + self.GenerateCommandLineValue(Pcd)
> --
> 2.20.1.windows.1