public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [Patch] BaseTools: Fix the build report issue for VPD
@ 2019-01-16 15:30 Feng, Bob C
  2019-01-16 16:02 ` Gao, Liming
  0 siblings, 1 reply; 3+ messages in thread
From: Feng, Bob C @ 2019-01-16 15:30 UTC (permalink / raw)
  To: edk2-devel; +Cc: BobCF, Liming Gao

From: BobCF <bob.c.feng@intel.com>

Make sure the PlatformAutoGen.AllPcdList always be latest,
or build report will fail sometimes.

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/AutoGen/AutoGen.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index cfe2d29099..85d966c62f 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1029,11 +1029,10 @@ class PlatformAutoGen(AutoGen):
         self.Arch = Arch
         self.SourceDir = PlatformFile.SubDir
         self.SourceOverrideDir = None
         self.FdTargetList = self.Workspace.FdTargetList
         self.FvTargetList = self.Workspace.FvTargetList
-        self.AllPcdList = []
         # get the original module/package/platform objects
         self.BuildDatabase = Workspace.BuildDatabase
         self.DscBuildDataObj = Workspace.Platform
 
         # flag indicating if the makefile/C-code file has been created or not
@@ -1110,10 +1109,13 @@ class PlatformAutoGen(AutoGen):
         self.LibraryBuildDirectoryList = Makefile.GetLibraryBuildDirectoryList()
         self.ModuleBuildDirectoryList = Makefile.GetModuleBuildDirectoryList()
 
         self.IsMakeFileCreated = True
 
+    @property
+    def AllPcdList(self):
+        return self.DynamicPcdList + self.NonDynamicPcdList
     ## Deal with Shared FixedAtBuild Pcds
     #
     def CollectFixedAtBuildPcds(self):
         for LibAuto in self.LibraryAutoGenList:
             FixedAtBuildPcds = {}
@@ -1624,11 +1626,10 @@ class PlatformAutoGen(AutoGen):
                     if type(SkuId) in (str, unicode) and eval(SkuId) == 0 or SkuId == 0:
                         continue
                     pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT])
                     pcd.SkuInfoList[SkuName].SkuId = SkuId
                     pcd.SkuInfoList[SkuName].SkuIdName = SkuName
-        self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList
 
     def FixVpdOffset(self, VpdFile ):
         FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)
         if not os.path.exists(FvPath):
             try:
-- 
2.19.1.windows.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [Patch] BaseTools: Fix the build report issue for VPD
  2019-01-16 15:30 [Patch] BaseTools: Fix the build report issue for VPD Feng, Bob C
@ 2019-01-16 16:02 ` Gao, Liming
  2019-01-16 16:26   ` Feng, Bob C
  0 siblings, 1 reply; 3+ messages in thread
From: Gao, Liming @ 2019-01-16 16:02 UTC (permalink / raw)
  To: Feng, Bob C, edk2-devel@lists.01.org

Bob:
  Please submit BZ for this issue. Could we merge these two patches? Seemly, they are both build report issue. 

Thanks
Liming
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Feng, Bob C
> Sent: Wednesday, January 16, 2019 11:30 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix the build report issue for VPD
> 
> From: BobCF <bob.c.feng@intel.com>
> 
> Make sure the PlatformAutoGen.AllPcdList always be latest,
> or build report will fail sometimes.
> 
> 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/AutoGen/AutoGen.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index cfe2d29099..85d966c62f 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -1029,11 +1029,10 @@ class PlatformAutoGen(AutoGen):
>          self.Arch = Arch
>          self.SourceDir = PlatformFile.SubDir
>          self.SourceOverrideDir = None
>          self.FdTargetList = self.Workspace.FdTargetList
>          self.FvTargetList = self.Workspace.FvTargetList
> -        self.AllPcdList = []
>          # get the original module/package/platform objects
>          self.BuildDatabase = Workspace.BuildDatabase
>          self.DscBuildDataObj = Workspace.Platform
> 
>          # flag indicating if the makefile/C-code file has been created or not
> @@ -1110,10 +1109,13 @@ class PlatformAutoGen(AutoGen):
>          self.LibraryBuildDirectoryList = Makefile.GetLibraryBuildDirectoryList()
>          self.ModuleBuildDirectoryList = Makefile.GetModuleBuildDirectoryList()
> 
>          self.IsMakeFileCreated = True
> 
> +    @property
> +    def AllPcdList(self):
> +        return self.DynamicPcdList + self.NonDynamicPcdList
>      ## Deal with Shared FixedAtBuild Pcds
>      #
>      def CollectFixedAtBuildPcds(self):
>          for LibAuto in self.LibraryAutoGenList:
>              FixedAtBuildPcds = {}
> @@ -1624,11 +1626,10 @@ class PlatformAutoGen(AutoGen):
>                      if type(SkuId) in (str, unicode) and eval(SkuId) == 0 or SkuId == 0:
>                          continue
>                      pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT])
>                      pcd.SkuInfoList[SkuName].SkuId = SkuId
>                      pcd.SkuInfoList[SkuName].SkuIdName = SkuName
> -        self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList
> 
>      def FixVpdOffset(self, VpdFile ):
>          FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)
>          if not os.path.exists(FvPath):
>              try:
> --
> 2.19.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [Patch] BaseTools: Fix the build report issue for VPD
  2019-01-16 16:02 ` Gao, Liming
@ 2019-01-16 16:26   ` Feng, Bob C
  0 siblings, 0 replies; 3+ messages in thread
From: Feng, Bob C @ 2019-01-16 16:26 UTC (permalink / raw)
  To: Gao, Liming, edk2-devel@lists.01.org

OK. I'll submit BZ. The two patches are to fix two issues that have different root cause, so I think two patches would be better. 

-----Original Message-----
From: Gao, Liming 
Sent: Thursday, January 17, 2019 12:03 AM
To: Feng, Bob C <bob.c.feng@intel.com>; edk2-devel@lists.01.org
Subject: RE: [edk2] [Patch] BaseTools: Fix the build report issue for VPD

Bob:
  Please submit BZ for this issue. Could we merge these two patches? Seemly, they are both build report issue. 

Thanks
Liming
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of 
> Feng, Bob C
> Sent: Wednesday, January 16, 2019 11:30 PM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>
> Subject: [edk2] [Patch] BaseTools: Fix the build report issue for VPD
> 
> From: BobCF <bob.c.feng@intel.com>
> 
> Make sure the PlatformAutoGen.AllPcdList always be latest, or build 
> report will fail sometimes.
> 
> 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/AutoGen/AutoGen.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py 
> b/BaseTools/Source/Python/AutoGen/AutoGen.py
> index cfe2d29099..85d966c62f 100644
> --- a/BaseTools/Source/Python/AutoGen/AutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
> @@ -1029,11 +1029,10 @@ class PlatformAutoGen(AutoGen):
>          self.Arch = Arch
>          self.SourceDir = PlatformFile.SubDir
>          self.SourceOverrideDir = None
>          self.FdTargetList = self.Workspace.FdTargetList
>          self.FvTargetList = self.Workspace.FvTargetList
> -        self.AllPcdList = []
>          # get the original module/package/platform objects
>          self.BuildDatabase = Workspace.BuildDatabase
>          self.DscBuildDataObj = Workspace.Platform
> 
>          # flag indicating if the makefile/C-code file has been 
> created or not @@ -1110,10 +1109,13 @@ class PlatformAutoGen(AutoGen):
>          self.LibraryBuildDirectoryList = Makefile.GetLibraryBuildDirectoryList()
>          self.ModuleBuildDirectoryList = 
> Makefile.GetModuleBuildDirectoryList()
> 
>          self.IsMakeFileCreated = True
> 
> +    @property
> +    def AllPcdList(self):
> +        return self.DynamicPcdList + self.NonDynamicPcdList
>      ## Deal with Shared FixedAtBuild Pcds
>      #
>      def CollectFixedAtBuildPcds(self):
>          for LibAuto in self.LibraryAutoGenList:
>              FixedAtBuildPcds = {}
> @@ -1624,11 +1626,10 @@ class PlatformAutoGen(AutoGen):
>                      if type(SkuId) in (str, unicode) and eval(SkuId) == 0 or SkuId == 0:
>                          continue
>                      pcd.SkuInfoList[SkuName] = copy.deepcopy(pcd.SkuInfoList[TAB_DEFAULT])
>                      pcd.SkuInfoList[SkuName].SkuId = SkuId
>                      pcd.SkuInfoList[SkuName].SkuIdName = SkuName
> -        self.AllPcdList = self._NonDynamicPcdList + self._DynamicPcdList
> 
>      def FixVpdOffset(self, VpdFile ):
>          FvPath = os.path.join(self.BuildDir, TAB_FV_DIRECTORY)
>          if not os.path.exists(FvPath):
>              try:
> --
> 2.19.1.windows.1
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-01-16 16:26 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-16 15:30 [Patch] BaseTools: Fix the build report issue for VPD Feng, Bob C
2019-01-16 16:02 ` Gao, Liming
2019-01-16 16:26   ` Feng, Bob C

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox