[Patch] BaseTools: Fix the bug to display the single SKUID info

[Patch] BaseTools: Fix the bug to display the single SKUID info

[Yonghong Zhu]

when defined SKUID_IDENTIFIER = DEFAULT|TEST in DSC [Defines] section,
per spec it means current SKUID is single, the bug is build report print
both DEFAULT and TEST info, it should only print TEST.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index b13e35c..1461d00 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -2237,10 +2237,14 @@ class SkuClass():
             self.AvailableSkuIds.update({'DEFAULT':0, 'COMMON':0})
         if self.SkuIdSet:
             GlobalData.gSkuids = (self.SkuIdSet)
             if 'COMMON' in GlobalData.gSkuids:
                 GlobalData.gSkuids.remove('COMMON')
+            if self.SkuUsageType == self.SINGLE:
+                if len(GlobalData.gSkuids) != 1:
+                    if 'DEFAULT' in GlobalData.gSkuids:
+                        GlobalData.gSkuids.remove('DEFAULT')
             if GlobalData.gSkuids:
                 GlobalData.gSkuids.sort()
 
     def GetNextSkuId(self, skuname):
         if not self.__SkuInherit:
-- 
2.6.1.windows.1

Re: [Patch] BaseTools: Fix the bug to display the single SKUID info

[Gao, Liming]

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

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Wednesday, February 21, 2018 10:10 AM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix the bug to display the single SKUID info
>
>when defined SKUID_IDENTIFIER = DEFAULT|TEST in DSC [Defines] section,
>per spec it means current SKUID is single, the bug is build report print
>both DEFAULT and TEST info, it should only print TEST.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/Common/Misc.py | 4 ++++
> 1 file changed, 4 insertions(+)
>
>diff --git a/BaseTools/Source/Python/Common/Misc.py
>b/BaseTools/Source/Python/Common/Misc.py
>index b13e35c..1461d00 100644
>--- a/BaseTools/Source/Python/Common/Misc.py
>+++ b/BaseTools/Source/Python/Common/Misc.py
>@@ -2237,10 +2237,14 @@ class SkuClass():
>             self.AvailableSkuIds.update({'DEFAULT':0, 'COMMON':0})
>         if self.SkuIdSet:
>             GlobalData.gSkuids = (self.SkuIdSet)
>             if 'COMMON' in GlobalData.gSkuids:
>                 GlobalData.gSkuids.remove('COMMON')
>+            if self.SkuUsageType == self.SINGLE:
>+                if len(GlobalData.gSkuids) != 1:
>+                    if 'DEFAULT' in GlobalData.gSkuids:
>+                        GlobalData.gSkuids.remove('DEFAULT')
>             if GlobalData.gSkuids:
>                 GlobalData.gSkuids.sort()
>
>     def GetNextSkuId(self, skuname):
>         if not self.__SkuInherit:
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel