1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue

Bob Feng posted 1 patch 5 years, 3 months ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/build/build.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
Posted by Bob Feng 5 years, 3 months ago 
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2090

This is a regression issue introduced by commit e8449e.
This patch is going to fix this issue.

Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/build/build.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
index 2c10670a69..0406ac314b 100755
--- a/BaseTools/Source/Python/build/build.py
+++ b/BaseTools/Source/Python/build/build.py
@@ -1217,11 +1217,10 @@ class Build():
             # for target which must generate AutoGen code and makefile
             mqueue = mp.Queue()
             for m in AutoGenObject.GetAllModuleInfo:
                 mqueue.put(m)
 
-            AutoGenObject.DataPipe.DataContainer = {"FfsCommand":FfsCommand}
             AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}
             self.Progress.Start("Generating makefile and code")
             data_pipe_file = os.path.join(AutoGenObject.BuildDir, "GlobalVar_%s_%s.bin" % (str(AutoGenObject.Guid),AutoGenObject.Arch))
             AutoGenObject.DataPipe.dump(data_pipe_file)
             autogen_rt,errorcode = self.StartAutoGen(mqueue, AutoGenObject.DataPipe, self.SkipAutoGen, PcdMaList, GlobalData.gCacheIR)
@@ -1736,10 +1735,12 @@ class Build():
                         if Ma.PcdIsDriver:
                             Ma.PlatformInfo = Pa
                             Ma.Workspace = Wa
                             PcdMaList.append(Ma)
                         self.BuildModules.append(Ma)
+                    Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}
+                    Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}
                     self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict,PcdMaList=PcdMaList)
 
                 # Create MAP file when Load Fix Address is enabled.
                 if self.Target in ["", "all", "fds"]:
                     for Arch in Wa.ArchList:
-- 
2.20.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#46143): https://edk2.groups.io/g/devel/message/46143
Mute This Topic: https://groups.io/mt/32976745/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
Posted by Liming Gao 5 years, 3 months ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Bob Feng
> Sent: Wednesday, August 21, 2019 5:57 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2090
> 
> This is a regression issue introduced by commit e8449e.
> This patch is going to fix this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/build/build.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
> index 2c10670a69..0406ac314b 100755
> --- a/BaseTools/Source/Python/build/build.py
> +++ b/BaseTools/Source/Python/build/build.py
> @@ -1217,11 +1217,10 @@ class Build():
>              # for target which must generate AutoGen code and makefile
>              mqueue = mp.Queue()
>              for m in AutoGenObject.GetAllModuleInfo:
>                  mqueue.put(m)
> 
> -            AutoGenObject.DataPipe.DataContainer = {"FfsCommand":FfsCommand}
>              AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}
>              self.Progress.Start("Generating makefile and code")
>              data_pipe_file = os.path.join(AutoGenObject.BuildDir, "GlobalVar_%s_%s.bin" %
> (str(AutoGenObject.Guid),AutoGenObject.Arch))
>              AutoGenObject.DataPipe.dump(data_pipe_file)
>              autogen_rt,errorcode = self.StartAutoGen(mqueue, AutoGenObject.DataPipe, self.SkipAutoGen, PcdMaList,
> GlobalData.gCacheIR)
> @@ -1736,10 +1735,12 @@ class Build():
>                          if Ma.PcdIsDriver:
>                              Ma.PlatformInfo = Pa
>                              Ma.Workspace = Wa
>                              PcdMaList.append(Ma)
>                          self.BuildModules.append(Ma)
> +                    Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}
> +                    Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}
>                      self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict,PcdMaList=PcdMaList)
> 
>                  # Create MAP file when Load Fix Address is enabled.
>                  if self.Target in ["", "all", "fds"]:
>                      for Arch in Wa.ArchList:
> --
> 2.20.1.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#46150): https://edk2.groups.io/g/devel/message/46150
Mute This Topic: https://groups.io/mt/32976745/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
Posted by Bob Feng 5 years, 3 months ago 
Pushed at 5f7bb39117167018729dc938452c65ea7572eb1f

-----Original Message-----
From: Gao, Liming 
Sent: Wednesday, August 21, 2019 9:35 PM
To: devel@edk2.groups.io; Feng, Bob C <bob.c.feng@intel.com>
Subject: RE: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue

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

> -----Original Message-----
> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Bob Feng
> Sent: Wednesday, August 21, 2019 5:57 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@intel.com>
> Subject: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
> 
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=2090
> 
> This is a regression issue introduced by commit e8449e.
> This patch is going to fix this issue.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> ---
>  BaseTools/Source/Python/build/build.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Python/build/build.py
> index 2c10670a69..0406ac314b 100755
> --- a/BaseTools/Source/Python/build/build.py
> +++ b/BaseTools/Source/Python/build/build.py
> @@ -1217,11 +1217,10 @@ class Build():
>              # for target which must generate AutoGen code and makefile
>              mqueue = mp.Queue()
>              for m in AutoGenObject.GetAllModuleInfo:
>                  mqueue.put(m)
> 
> -            AutoGenObject.DataPipe.DataContainer = {"FfsCommand":FfsCommand}
>              AutoGenObject.DataPipe.DataContainer = {"CommandTarget": self.Target}
>              self.Progress.Start("Generating makefile and code")
>              data_pipe_file = os.path.join(AutoGenObject.BuildDir, "GlobalVar_%s_%s.bin" %
> (str(AutoGenObject.Guid),AutoGenObject.Arch))
>              AutoGenObject.DataPipe.dump(data_pipe_file)
>              autogen_rt,errorcode = self.StartAutoGen(mqueue, AutoGenObject.DataPipe, self.SkipAutoGen, PcdMaList,
> GlobalData.gCacheIR)
> @@ -1736,10 +1735,12 @@ class Build():
>                          if Ma.PcdIsDriver:
>                              Ma.PlatformInfo = Pa
>                              Ma.Workspace = Wa
>                              PcdMaList.append(Ma)
>                          self.BuildModules.append(Ma)
> +                    Pa.DataPipe.DataContainer = {"FfsCommand":CmdListDict}
> +                    Pa.DataPipe.DataContainer = {"Workspace_timestamp": Wa._SrcTimeStamp}
>                      self._BuildPa(self.Target, Pa, FfsCommand=CmdListDict,PcdMaList=PcdMaList)
> 
>                  # Create MAP file when Load Fix Address is enabled.
>                  if self.Target in ["", "all", "fds"]:
>                      for Arch in Wa.ArchList:
> --
> 2.20.1.windows.1
> 
> 
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#46256): https://edk2.groups.io/g/devel/message/46256
Mute This Topic: https://groups.io/mt/32976745/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.