Re: [Patch] BaseTools: Fix Sku inherit issue.

["Gao, Liming" <liming.gao@intel.com>]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>BobCF
>Sent: Wednesday, December 27, 2017 2:04 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix Sku inherit issue.
>
>The final Pcd value should only be override by its parents.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Feng Bob C <bob.c.feng@intel.com>
>Reviewed-by: Liming Gao <liming.gao@intel.com>
>---
> BaseTools/Source/Python/Common/Misc.py            | 2 ++
> BaseTools/Source/Python/Workspace/DscBuildData.py | 4 ++--
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
>diff --git a/BaseTools/Source/Python/Common/Misc.py
>b/BaseTools/Source/Python/Common/Misc.py
>index 0374be0631..dc214dbfa8 100644
>--- a/BaseTools/Source/Python/Common/Misc.py
>+++ b/BaseTools/Source/Python/Common/Misc.py
>@@ -2198,10 +2198,12 @@ class SkuClass():
>             for item in self.SkuData.values():
>                 self.__SkuInherit[item[1]]=item[2] if item[2] else "DEFAULT"
>         return self.__SkuInherit.get(skuname,"DEFAULT")
>
>     def GetSkuChain(self,sku):
>+        if sku == "DEFAULT":
>+            return ["DEFAULT"]
>         skulist = [sku]
>         nextsku = sku
>         while 1:
>             nextsku = self.GetNextSkuId(nextsku)
>             skulist.append(nextsku)
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index 929c317957..5e052eca7c 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -1319,11 +1319,11 @@ class DscBuildData(PlatformBuildClassObject):
>                             FieldName = FieldName.split(']', 1)[1]
>                         FieldName = NewFieldName + FieldName
>                         while '[' in FieldName:
>                             FieldName = FieldName.rsplit('[', 1)[0]
>                             CApp = CApp + '  __FLEXIBLE_SIZE(Size, %s, %s, %d);\n' %
>(Pcd.DatumType, FieldName.strip("."), ArrayIndex + 1)
>-            for skuname in self.SkuIdMgr.SkuOverrideOrder():
>+            for skuname in self.SkuIdMgr.GetSkuChain(SkuName):
>                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
>                 for FieldList in [inherit_OverrideValues.get(DefaultStoreName)]:
>                     if not FieldList:
>                         continue
>                     for FieldName in FieldList:
>@@ -1383,11 +1383,11 @@ class DscBuildData(PlatformBuildClassObject):
>                     else:
>                         if ValueSize > 4:
>                             CApp = CApp + '  Pcd->%s = %dULL; // From %s Line %d
>Value %s\n' % (FieldName, Value, FieldList[FieldName][1],
>FieldList[FieldName][2], FieldList[FieldName][0])
>                         else:
>                             CApp = CApp + '  Pcd->%s = %d; // From %s Line %d
>Value %s\n' % (FieldName, Value, FieldList[FieldName][1],
>FieldList[FieldName][2], FieldList[FieldName][0])
>-            for skuname in self.SkuIdMgr.SkuOverrideOrder():
>+            for skuname in self.SkuIdMgr.GetSkuChain(SkuName):
>                 inherit_OverrideValues = Pcd.SkuOverrideValues[skuname]
>                 for FieldList in
>[Pcd.DefaultFromDSC,inherit_OverrideValues.get(DefaultStoreName)]:
>                     if not FieldList:
>                         continue
>                     if Pcd.DefaultFromDSC and FieldList == Pcd.DefaultFromDSC:
>--
>2.14.3.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel