* [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
@ 2019-08-21 9:57 Bob Feng
2019-08-21 13:34 ` [edk2-devel] " Liming Gao
0 siblings, 1 reply; 3+ messages in thread
From: Bob Feng @ 2019-08-21 9:57 UTC (permalink / raw)
To: devel; +Cc: Liming Gao, Bob Feng
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
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
2019-08-21 9:57 [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue Bob Feng
@ 2019-08-21 13:34 ` Liming Gao
2019-08-23 6:20 ` Bob Feng
0 siblings, 1 reply; 3+ messages in thread
From: Liming Gao @ 2019-08-21 13:34 UTC (permalink / raw)
To: devel@edk2.groups.io, Feng, Bob C
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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue
2019-08-21 13:34 ` [edk2-devel] " Liming Gao
@ 2019-08-23 6:20 ` Bob Feng
0 siblings, 0 replies; 3+ messages in thread
From: Bob Feng @ 2019-08-23 6:20 UTC (permalink / raw)
To: Gao, Liming, devel@edk2.groups.io
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
>
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-08-23 6:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-21 9:57 [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue Bob Feng
2019-08-21 13:34 ` [edk2-devel] " Liming Gao
2019-08-23 6:20 ` Bob Feng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox