Revision: 15831
http://sourceforge.net/p/edk2/code/15831
Author: hchen30
Date: 2014-08-19 08:22:04 +0000 (Tue, 19 Aug 2014)
Log Message:
-----------
This patch is going to fix a build failure (running of GenFds) in Linux system
caused by patch at r15816.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hess Chen <[email protected]>
Reviewed-by: Gao, Liming <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/15816
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/AutoGen/GenMake.py
trunk/edk2/BaseTools/Source/Python/build/build.py
Modified: trunk/edk2/BaseTools/Source/Python/AutoGen/GenMake.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/AutoGen/GenMake.py 2014-08-19
08:10:09 UTC (rev 15830)
+++ trunk/edk2/BaseTools/Source/Python/AutoGen/GenMake.py 2014-08-19
08:22:04 UTC (rev 15831)
@@ -1200,7 +1200,7 @@
#
class TopLevelMakefile(BuildFile):
## template used to generate toplevel makefile
- _TEMPLATE_ = TemplateString('''${BEGIN}\tGenFds -f "${fdf_file}" -o
"${platform_build_directory}" -t ${toolchain_tag} -b ${build_target} -p
"${active_platform}" -a ${build_architecture_list}
${extra_options}${END}${BEGIN} -r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN}
-C ${cap} ${END}${BEGIN} -D ${macro} ${END}''')
+ _TEMPLATE_ = TemplateString('''${BEGIN}\tGenFds -f ${fdf_file} -o
${platform_build_directory} -t ${toolchain_tag} -b ${build_target} -p
${active_platform} -a ${build_architecture_list} ${extra_options}${END}${BEGIN}
-r ${fd} ${END}${BEGIN} -i ${fv} ${END}${BEGIN} -C ${cap} ${END}${BEGIN} -D
${macro} ${END}''')
## Constructor of TopLevelMakefile
#
Modified: trunk/edk2/BaseTools/Source/Python/build/build.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/build/build.py 2014-08-19 08:10:09 UTC
(rev 15830)
+++ trunk/edk2/BaseTools/Source/Python/build/build.py 2014-08-19 08:22:04 UTC
(rev 15831)
@@ -245,7 +245,14 @@
# if working directory doesn't exist, Popen() will raise an exception
if not os.path.isdir(WorkingDir):
EdkLogger.error("build", FILE_NOT_FOUND, ExtraData=WorkingDir)
-
+
+ # Command is used as the first Argument in following Popen().
+ # It could be a string or sequence. We find that if command is a string in
following Popen(),
+ # ubuntu may fail with an error message that the command is not found.
+ # So here we may need convert command from string to list instance.
+ if not isinstance(Command, list):
+ Command = Command.split()
+
Proc = None
EndOfProcedure = None
try:
@@ -1402,12 +1409,6 @@
for Arch in Wa.ArchList:
GlobalData.gGlobalDefines['ARCH'] = Arch
Pa = PlatformAutoGen(Wa, self.PlatformFile, BuildTarget,
ToolChain, Arch)
- for Module in Pa.Platform.Modules:
- # Get ModuleAutoGen object to generate C code file and
makefile
- Ma = ModuleAutoGen(Wa, Module, BuildTarget, ToolChain,
Arch, self.PlatformFile)
- if Ma == None:
- continue
- self.BuildModules.append(Ma)
self._BuildPa(self.Target, Pa)
# Create MAP file when Load Fix Address is enabled.
@@ -1491,7 +1492,6 @@
Ma = ModuleAutoGen(Wa, self.ModuleFile, BuildTarget,
ToolChain, Arch, self.PlatformFile)
if Ma == None: continue
MaList.append(Ma)
- self.BuildModules.append(Ma)
if not Ma.IsBinaryModule:
self._Build(self.Target, Ma, BuildModule=True)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
