[PATCH v2] UefiPayloadPkg: Backward support with python 3.6


kasimx.liu@...
 

From: KasimX Liu <kasimx.liu@...>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3960

Currently, UniversalPayloadBuild.py don't have support
python3.6, we use python3.6 will encounter f"" failure
use the change to fix it to support python3.6/3.7/3.8.

Cc: Guo Dong <guo.dong@...>
Cc: Ray Ni <ray.ni@...>
Cc: James Lu <james.lu@...>
Reviewed-by: Gua Guo <gua.guo@...>
Signed-off-by: KasimX Liu <kasimx.liu@...>
---
UefiPayloadPkg/UniversalPayloadBuild.py | 33 +++++++++++++++-----
1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive=
rsalPayloadBuild.py
index c71526e0a6..ab4c977ba5 100644
--- a/UefiPayloadPkg/UniversalPayloadBuild.py
+++ b/UefiPayloadPkg/UniversalPayloadBuild.py
@@ -59,15 +59,15 @@ def BuildUniversalPayload(Args, MacroList):
if Args.Arch =3D=3D 'X64':=0D
BuildArch =3D "X64"=0D
ObjCopyFlag =3D "elf64-x86-64"=0D
- EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfTool=
Chain}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPay=
loadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D
+ EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar=
get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U=
niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D
else:=0D
BuildArch =3D "IA32 -a X64"=0D
ObjCopyFlag =3D "elf32-i386"=0D
- EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfTool=
Chain}", os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPa=
yloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D
+ EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar=
get, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/=
UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D
=0D
EntryModuleInf =3D os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/U=
niversalPayloadEntry.inf")=0D
DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc")=0D
- FvOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", o=
s.path.normpath("FV/DXEFV.Fv"))=0D
+ FvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget, To=
olChain), os.path.normpath("FV/DXEFV.Fv"))=0D
PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt=
")=0D
ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry=
.txt")=0D
UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin")=0D
@@ -94,14 +94,14 @@ def BuildUniversalPayload(Args, MacroList):
#=0D
# Building DXE core and DXE drivers as DXEFV.=0D
#=0D
- BuildPayload =3D f"build -p {DscPath} -b {BuildTarget} -a X64 -t {Tool=
Chain} -y {PayloadReportPath} {Quiet}"=0D
+ BuildPayload =3D "build -p {} -b {} -a X64 -t {} -y {} {}".format (Dsc=
Path, BuildTarget, ToolChain, PayloadReportPath, Quiet)=0D
BuildPayload +=3D Pcds=0D
BuildPayload +=3D Defines=0D
RunCommand(BuildPayload)=0D
#=0D
# Building Universal Payload entry.=0D
#=0D
- BuildModule =3D f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -=
m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath} {Quiet}"=0D
+ BuildModule =3D "build -p {} -b {} -a {} -m {} -t {} -y {} {}".format =
(DscPath, BuildTarget, BuildArch, EntryModuleInf, ElfToolChain, ModuleRepor=
tPath, Quiet)=0D
BuildModule +=3D Pcds=0D
BuildModule +=3D Defines=0D
RunCommand(BuildModule)=0D
@@ -118,9 +118,26 @@ def BuildUniversalPayload(Args, MacroList):
#=0D
# Copy the DXEFV as a section in elf format Universal Payload entry.=0D
#=0D
- remove_section =3D f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyF=
lag} --remove-section .upld_info --remove-section .upld.uefi_fv {EntryOutpu=
tDir}'=0D
- add_section =3D f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyF=
lag} --add-section .upld_info=3D{UpldInfoFile} --add-section .upld.uefi_fv=
=3D{FvOutputDir} {EntryOutputDir}'=0D
- set_section =3D f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyF=
lag} --set-section-alignment .upld.upld_info=3D16 --set-section-alignment .=
upld.uefi_fv=3D16 {EntryOutputDir}'=0D
+ remove_section =3D '"{}" -I {} -O {} --remove-section .upld_info --rem=
ove-section .upld.uefi_fv {}'.format (=0D
+ LlvmObjcopyPath,=0D
+ ObjCopyFlag,=0D
+ ObjCopyFlag,=0D
+ EntryOutputDir=0D
+ )=0D
+ add_section =3D '"{}" -I {} -O {} --add-section .upld_info=3D{} --a=
dd-section .upld.uefi_fv=3D{} {}'.format (=0D
+ LlvmObjcopyPath,=0D
+ ObjCopyFlag,=0D
+ ObjCopyFlag,=0D
+ UpldInfoFile,=0D
+ FvOutputDir,=0D
+ EntryOutputDir=0D
+ )=0D
+ set_section =3D '"{}" -I {} -O {} --set-section-alignment .upld.upl=
d_info=3D16 --set-section-alignment .upld.uefi_fv=3D16 {}'.format (=0D
+ LlvmObjcopyPath,=0D
+ ObjCopyFlag,=0D
+ ObjCopyFlag,=0D
+ EntryOutputDir=0D
+ )=0D
RunCommand(remove_section)=0D
RunCommand(add_section)=0D
RunCommand(set_section)=0D
--=20
2.32.0.windows.2

Join devel@edk2.groups.io to automatically receive all group messages.