* [Patch] BaseTools: Remove unused logic for EDKI
@ 2019-01-14 6:54 Feng, Bob C
2019-01-14 7:22 ` Gao, Liming
2019-01-14 10:08 ` Laszlo Ersek
0 siblings, 2 replies; 4+ messages in thread
From: Feng, Bob C @ 2019-01-14 6:54 UTC (permalink / raw)
To: edk2-devel; +Cc: Bob Feng, Liming Gao
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
Remove gEcpSource global variable in python tool.
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/Workspace/DscBuildData.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 93751678f9..9881dbe556 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -707,11 +707,10 @@ class DscBuildData(PlatformBuildClassObject):
return self.DefaultStores
def OverrideDuplicateModule(self):
RecordList = self._RawData[MODEL_META_DATA_COMPONENT, self._Arch]
Macros = self._Macros
- Macros["EDK_SOURCE"] = GlobalData.gEcpSource
Components = {}
for Record in RecordList:
ModuleId = Record[6]
file_guid = self._RawData[MODEL_META_DATA_HEADER, self._Arch, None, ModuleId]
file_guid_str = file_guid[0][2] if file_guid else "NULL"
--
2.19.1.windows.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Patch] BaseTools: Remove unused logic for EDKI
2019-01-14 6:54 [Patch] BaseTools: Remove unused logic for EDKI Feng, Bob C
@ 2019-01-14 7:22 ` Gao, Liming
2019-01-14 10:08 ` Laszlo Ersek
1 sibling, 0 replies; 4+ messages in thread
From: Gao, Liming @ 2019-01-14 7:22 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel@lists.01.org
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Feng, Bob C
>Sent: Monday, January 14, 2019 2:55 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [edk2] [Patch] BaseTools: Remove unused logic for EDKI
>
>BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
>Remove gEcpSource global variable in python tool.
>
>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/Workspace/DscBuildData.py | 1 -
> 1 file changed, 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
>b/BaseTools/Source/Python/Workspace/DscBuildData.py
>index 93751678f9..9881dbe556 100644
>--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
>+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
>@@ -707,11 +707,10 @@ class DscBuildData(PlatformBuildClassObject):
> return self.DefaultStores
>
> def OverrideDuplicateModule(self):
> RecordList = self._RawData[MODEL_META_DATA_COMPONENT,
>self._Arch]
> Macros = self._Macros
>- Macros["EDK_SOURCE"] = GlobalData.gEcpSource
> Components = {}
> for Record in RecordList:
> ModuleId = Record[6]
> file_guid = self._RawData[MODEL_META_DATA_HEADER, self._Arch,
>None, ModuleId]
> file_guid_str = file_guid[0][2] if file_guid else "NULL"
>--
>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] 4+ messages in thread
* Re: [Patch] BaseTools: Remove unused logic for EDKI
2019-01-14 6:54 [Patch] BaseTools: Remove unused logic for EDKI Feng, Bob C
2019-01-14 7:22 ` Gao, Liming
@ 2019-01-14 10:08 ` Laszlo Ersek
2019-01-14 11:15 ` Feng, Bob C
1 sibling, 1 reply; 4+ messages in thread
From: Laszlo Ersek @ 2019-01-14 10:08 UTC (permalink / raw)
To: Feng, Bob C, edk2-devel; +Cc: Liming Gao, Gerd Hoffmann
Hi Bob,
On 01/14/19 07:54, Feng, Bob C wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
> Remove gEcpSource global variable in python tool.
>
> 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/Workspace/DscBuildData.py | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index 93751678f9..9881dbe556 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -707,11 +707,10 @@ class DscBuildData(PlatformBuildClassObject):
> return self.DefaultStores
>
> def OverrideDuplicateModule(self):
> RecordList = self._RawData[MODEL_META_DATA_COMPONENT, self._Arch]
> Macros = self._Macros
> - Macros["EDK_SOURCE"] = GlobalData.gEcpSource
> Components = {}
> for Record in RecordList:
> ModuleId = Record[6]
> file_guid = self._RawData[MODEL_META_DATA_HEADER, self._Arch, None, ModuleId]
> file_guid_str = file_guid[0][2] if file_guid else "NULL"
>
this patch (commit 4523bc82ae8e) breaks (minimally) the
ArmVirtPkg/ArmVirtQemu build:
> build.py...
> : error C0DE: Unknown fatal error when processing [OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf [AARCH64, GCC5, NOOPT]]
>
> (Please send email to edk2-devel@lists.01.org for help, attaching following call stack trace!)
>
> (Python 2.7.5 on linux2) Traceback (most recent call last):
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 2403, in Main
> MyBuild.Launch()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 2137, in Launch
> self._MultiThreadBuildPlatform()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 1927, in _MultiThreadBuildPlatform
> CmdListDict = self._GenFfsCmd()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 1883, in _GenFfsCmd
> GenFfsDict = GenFds.GenFfsMakefile('', GlobalData.gFdfParser, self, self.ArchList, GlobalData)
> File "BaseTools/Source/Python/GenFds/GenFds.py", line 544, in GenFfsMakefile
> GenFdsGlobalVariable.SetEnv(FdfParserObject, WorkSpace, ArchList, GlobalData)
> File "BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py", line 343, in SetEnv
> GenFdsGlobalVariable.EdkSourceDir = GlobalData.gGlobalDefines["EDK_SOURCE"]
> KeyError: 'EDK_SOURCE'
The "EDK_SOURCE" key is no longer added to the dictionary, but
"GenFds/GenFdsGlobalVariable.py" still references it. Can you please fix
it quickly; the build is broken.
(This was caught by Gerd's Jenkins CI setup.)
... At least I *believe* that this patch is what causes the symptom.
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Patch] BaseTools: Remove unused logic for EDKI
2019-01-14 10:08 ` Laszlo Ersek
@ 2019-01-14 11:15 ` Feng, Bob C
0 siblings, 0 replies; 4+ messages in thread
From: Feng, Bob C @ 2019-01-14 11:15 UTC (permalink / raw)
To: Laszlo Ersek, edk2-devel@lists.01.org; +Cc: Gao, Liming, Gerd Hoffmann
Hi Laszlo,
I sent out a patch for review. Sorry for break the build.
Thanks,
bob
-----Original Message-----
From: Laszlo Ersek [mailto:lersek@redhat.com]
Sent: Monday, January 14, 2019 6:09 PM
To: Feng, Bob C <bob.c.feng@intel.com>; edk2-devel@lists.01.org
Cc: Gao, Liming <liming.gao@intel.com>; Gerd Hoffmann <kraxel@redhat.com>
Subject: Re: [edk2] [Patch] BaseTools: Remove unused logic for EDKI
Hi Bob,
On 01/14/19 07:54, Feng, Bob C wrote:
> BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=1350
> Remove gEcpSource global variable in python tool.
>
> 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/Workspace/DscBuildData.py | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
> b/BaseTools/Source/Python/Workspace/DscBuildData.py
> index 93751678f9..9881dbe556 100644
> --- a/BaseTools/Source/Python/Workspace/DscBuildData.py
> +++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
> @@ -707,11 +707,10 @@ class DscBuildData(PlatformBuildClassObject):
> return self.DefaultStores
>
> def OverrideDuplicateModule(self):
> RecordList = self._RawData[MODEL_META_DATA_COMPONENT, self._Arch]
> Macros = self._Macros
> - Macros["EDK_SOURCE"] = GlobalData.gEcpSource
> Components = {}
> for Record in RecordList:
> ModuleId = Record[6]
> file_guid = self._RawData[MODEL_META_DATA_HEADER, self._Arch, None, ModuleId]
> file_guid_str = file_guid[0][2] if file_guid else "NULL"
>
this patch (commit 4523bc82ae8e) breaks (minimally) the ArmVirtPkg/ArmVirtQemu build:
> build.py...
> : error C0DE: Unknown fatal error when processing
> [OvmfPkg/Library/QemuFwCfgS3Lib/BaseQemuFwCfgS3LibNull.inf [AARCH64,
> GCC5, NOOPT]]
>
> (Please send email to edk2-devel@lists.01.org for help, attaching
> following call stack trace!)
>
> (Python 2.7.5 on linux2) Traceback (most recent call last):
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 2403, in Main
> MyBuild.Launch()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 2137, in Launch
> self._MultiThreadBuildPlatform()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 1927, in _MultiThreadBuildPlatform
> CmdListDict = self._GenFfsCmd()
> File "BaseTools/BinWrappers/PosixLike/../../Source/Python/build/build.py", line 1883, in _GenFfsCmd
> GenFfsDict = GenFds.GenFfsMakefile('', GlobalData.gFdfParser, self, self.ArchList, GlobalData)
> File "BaseTools/Source/Python/GenFds/GenFds.py", line 544, in GenFfsMakefile
> GenFdsGlobalVariable.SetEnv(FdfParserObject, WorkSpace, ArchList, GlobalData)
> File "BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py", line 343, in SetEnv
> GenFdsGlobalVariable.EdkSourceDir =
> GlobalData.gGlobalDefines["EDK_SOURCE"]
> KeyError: 'EDK_SOURCE'
The "EDK_SOURCE" key is no longer added to the dictionary, but "GenFds/GenFdsGlobalVariable.py" still references it. Can you please fix it quickly; the build is broken.
(This was caught by Gerd's Jenkins CI setup.)
... At least I *believe* that this patch is what causes the symptom.
Thanks,
Laszlo
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-01-14 11:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-14 6:54 [Patch] BaseTools: Remove unused logic for EDKI Feng, Bob C
2019-01-14 7:22 ` Gao, Liming
2019-01-14 10:08 ` Laszlo Ersek
2019-01-14 11:15 ` 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