* [Patch] BaseTools: Fix the build report issue about Structure PCD
@ 2019-02-01 9:00 Feng, Bob C
2019-02-14 14:29 ` Gao, Liming
0 siblings, 1 reply; 2+ messages in thread
From: Feng, Bob C @ 2019-02-01 9:00 UTC (permalink / raw)
To: edk2-devel; +Cc: Bob Feng, Liming Gao
https://bugzilla.tianocore.org/show_bug.cgi?id=1472
build report use incorrect method to parse DynamicDefault/DynamicExDefault
and DynamicVpd/DynamicExVpd structure Pcd value.
This patch is to fix this issue.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
BaseTools/Source/Python/build/BuildReport.py | 21 +++++++-------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 8d3b030151..64f8a68516 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1109,24 +1109,17 @@ class PcdReport(object):
break
else:
SkuList = sorted(Pcd.SkuInfoList.keys())
for Sku in SkuList:
SkuInfo = Pcd.SkuInfoList[Sku]
- if TypeName in ('DYNHII', 'DEXHII'):
- if SkuInfo.DefaultStoreDict:
- DefaultStoreList = sorted(SkuInfo.DefaultStoreDict.keys())
- for DefaultStore in DefaultStoreList:
- OverrideValues = Pcd.SkuOverrideValues[Sku]
- DscOverride = self.ParseStruct(OverrideValues[DefaultStore])
- if DscOverride:
- break
- else:
- OverrideValues = Pcd.SkuOverrideValues[Sku]
- if OverrideValues:
- Keys = list(OverrideValues.keys())
- OverrideFieldStruct = self.OverrideFieldValue(Pcd, OverrideValues[Keys[0]])
- DscOverride = self.ParseStruct(OverrideFieldStruct)
+ if SkuInfo.DefaultStoreDict:
+ DefaultStoreList = sorted(SkuInfo.DefaultStoreDict.keys())
+ for DefaultStore in DefaultStoreList:
+ OverrideValues = Pcd.SkuOverrideValues[Sku]
+ DscOverride = self.ParseStruct(OverrideValues[DefaultStore])
+ if DscOverride:
+ break
if DscOverride:
break
if DscOverride:
DscDefaultValue = True
DscMatch = True
--
2.20.1.windows.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch] BaseTools: Fix the build report issue about Structure PCD
2019-02-01 9:00 [Patch] BaseTools: Fix the build report issue about Structure PCD Feng, Bob C
@ 2019-02-14 14:29 ` Gao, Liming
0 siblings, 0 replies; 2+ messages in thread
From: Gao, Liming @ 2019-02-14 14:29 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: Feng, Bob C
> Sent: Friday, February 1, 2019 5:01 PM
> To: edk2-devel@lists.01.org
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [Patch] BaseTools: Fix the build report issue about Structure PCD
>
> https://bugzilla.tianocore.org/show_bug.cgi?id=1472
> build report use incorrect method to parse DynamicDefault/DynamicExDefault
> and DynamicVpd/DynamicExVpd structure Pcd value.
>
> This patch is to fix this issue.
>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
> BaseTools/Source/Python/build/BuildReport.py | 21 +++++++-------------
> 1 file changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
> index 8d3b030151..64f8a68516 100644
> --- a/BaseTools/Source/Python/build/BuildReport.py
> +++ b/BaseTools/Source/Python/build/BuildReport.py
> @@ -1109,24 +1109,17 @@ class PcdReport(object):
> break
> else:
> SkuList = sorted(Pcd.SkuInfoList.keys())
> for Sku in SkuList:
> SkuInfo = Pcd.SkuInfoList[Sku]
> - if TypeName in ('DYNHII', 'DEXHII'):
> - if SkuInfo.DefaultStoreDict:
> - DefaultStoreList = sorted(SkuInfo.DefaultStoreDict.keys())
> - for DefaultStore in DefaultStoreList:
> - OverrideValues = Pcd.SkuOverrideValues[Sku]
> - DscOverride = self.ParseStruct(OverrideValues[DefaultStore])
> - if DscOverride:
> - break
> - else:
> - OverrideValues = Pcd.SkuOverrideValues[Sku]
> - if OverrideValues:
> - Keys = list(OverrideValues.keys())
> - OverrideFieldStruct = self.OverrideFieldValue(Pcd, OverrideValues[Keys[0]])
> - DscOverride = self.ParseStruct(OverrideFieldStruct)
> + if SkuInfo.DefaultStoreDict:
> + DefaultStoreList = sorted(SkuInfo.DefaultStoreDict.keys())
> + for DefaultStore in DefaultStoreList:
> + OverrideValues = Pcd.SkuOverrideValues[Sku]
> + DscOverride = self.ParseStruct(OverrideValues[DefaultStore])
> + if DscOverride:
> + break
> if DscOverride:
> break
> if DscOverride:
> DscDefaultValue = True
> DscMatch = True
> --
> 2.20.1.windows.1
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-14 14:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-01 9:00 [Patch] BaseTools: Fix the build report issue about Structure PCD Feng, Bob C
2019-02-14 14:29 ` Gao, Liming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox