[PATCH] BaseTools:Fix issue caused by 84a52d4d030185a44f2d8736142c6f0b19c6e9b1

[PATCH] BaseTools:Fix issue caused by 84a52d4d030185a44f2d8736142c6f0b19c6e9b1

[Zhaozh1x]

The commit 84a52d4d030185a44f2d8736142c6f0b19c6e9b1 will introduce
the new issue "Invalid offset value for Dynamic Vpd PCD". This patch
will fix the new issue, add 'DEFAULT' sku in to the AvailableSkuIdSet
variable.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: ZhiqiangX Zhao <zhiqiangx.zhao@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Workspace/DscBuildData.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index ac0f0bee47..3ccfdbdb7b 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -1388,6 +1388,7 @@ class DscBuildData(PlatformBuildClassObject):
         Pcds = AllPcds
         DefaultStoreMgr = DefaultStore(self.DefaultStores)
         SkuIds = self.SkuIds
+        self.SkuIdMgr.AvailableSkuIdSet.update({TAB_DEFAULT:0})
         DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in skuobj.DefaultStoreDict}
 
         S_PcdSet = []
-- 
2.14.1.windows.1

Re: [PATCH] BaseTools:Fix issue caused by 84a52d4d030185a44f2d8736142c6f0b19c6e9b1

[Gao, Liming]

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

> -----Original Message-----
> From: Zhao, ZhiqiangX
> Sent: Wednesday, September 26, 2018 6:30 PM
> To: edk2-devel@lists.01.org
> Cc: Zhao, ZhiqiangX <zhiqiangx.zhao@intel.com>; Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>;
> Feng, Bob C <bob.c.feng@intel.com>
> Subject: [PATCH] BaseTools:Fix issue caused by 84a52d4d030185a44f2d8736142c6f0b19c6e9b1
> 
> The commit 84a52d4d030185a44f2d8736142c6f0b19c6e9b1 will introduce
> the new issue "Invalid offset value for Dynamic Vpd PCD". This patch
> will fix the new issue, add 'DEFAULT' sku in to the AvailableSkuIdSet
> variable.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: ZhiqiangX Zhao <zhiqiangx.zhao@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Cc: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/Workspace/DscBuildData.py | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index ac0f0bee47..3ccfdbdb7b 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -1388,6 +1388,7 @@ class DscBuildData(PlatformBuildClassObject):
>          Pcds = AllPcds
>          DefaultStoreMgr = DefaultStore(self.DefaultStores)
>          SkuIds = self.SkuIds
> +        self.SkuIdMgr.AvailableSkuIdSet.update({TAB_DEFAULT:0})
>          DefaultStores = {storename for pcdobj in AllPcds.values() for skuobj in pcdobj.SkuInfoList.values() for storename in
> skuobj.DefaultStoreDict}
> 
>          S_PcdSet = []
> --
> 2.14.1.windows.1