Re: [Patch] BaseTools: Remove unused logic for EDKI

[Laszlo Ersek <lersek@redhat.com>]

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