From 4ce415e55d93a9ae9fa1fbd6b40080877ae5f23b Mon Sep 17 00:00:00 2001 From: Yonghong Zhu Date: Wed, 11 May 2016 16:09:26 +0800 Subject: BaseTools/GenFds: enhance INF built arch filter The bug is use FILE_GUID override to build the same module more than once, GenFds report warning "xxx NOT found in DSC file; Is it really a binary module?". The root cause is the module path with FILE_GUID overridden has the file name FILE_GUIDmodule.inf, then PlatformDataBase.Modules use FILE_GUIDmodule.inf as key which cause __GetPlatformArchList__ return empty. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/GenFds/FfsInfStatement.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'BaseTools/Source/Python') diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index bba42c7308..b0b22d194d 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -570,6 +570,16 @@ class FfsInfStatement(FfsInfStatementClassObject): if PlatformDataBase != None: if InfFileKey in PlatformDataBase.Modules: DscArchList.append (Arch) + else: + # + # BaseTools support build same module more than once, the module path with FILE_GUID overridden has + # the file name FILE_GUIDmodule.inf, then PlatformDataBase.Modules use FILE_GUIDmodule.inf as key, + # but the path (self.MetaFile.Path) is the real path + # + for key in PlatformDataBase.Modules.keys(): + if InfFileKey == str((PlatformDataBase.Modules[key]).MetaFile.Path): + DscArchList.append (Arch) + break return DscArchList -- cgit v1.2.3