Why use PY 3.6? Even PY 3.8 is about to be deprecated by Python community. > -----Original Message----- > From: Liu, KasimX <kasimx....@intel.com> > Sent: Friday, June 24, 2022 11:48 AM > To: devel@edk2.groups.io > Cc: Liu, KasimX <kasimx....@intel.com>; Dong, Guo <guo.d...@intel.com>; Ni, > Ray <ray...@intel.com>; Lu, James > <james...@intel.com>; Guo, Gua <gua....@intel.com> > Subject: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6 > > From: KasimX Liu <kasimx....@intel.com> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3960 > > 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.d...@intel.com> > Cc: Ray Ni <ray...@intel.com> > Cc: James Lu <james...@intel.com> > Reviewed-by: Gua Guo <gua....@intel.com> > Signed-off-by: KasimX Liu <kasimx....@intel.com> > --- > UefiPayloadPkg/UniversalPayloadBuild.py | 33 +++++++++++++++----- > 1 file changed, 25 insertions(+), 8 deletions(-) > > diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py > b/UefiPayloadPkg/UniversalPayloadBuild.py > index c71526e0a6..ab4c977ba5 100644 > --- a/UefiPayloadPkg/UniversalPayloadBuild.py > +++ b/UefiPayloadPkg/UniversalPayloadBuild.py > @@ -59,15 +59,15 @@ def BuildUniversalPayload(Args, MacroList): > if Args.Arch == 'X64': > > BuildArch = "X64" > > ObjCopyFlag = "elf64-x86-64" > > - EntryOutputDir = os.path.join(BuildDir, > f"{BuildTarget}_{ElfToolChain}", > os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) > > + EntryOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, > ElfToolChain), > os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) > > else: > > BuildArch = "IA32 -a X64" > > ObjCopyFlag = "elf32-i386" > > - EntryOutputDir = os.path.join(BuildDir, > f"{BuildTarget}_{ElfToolChain}", > os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) > > + EntryOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, > ElfToolChain), > os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) > > > > EntryModuleInf = > os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf") > > DscPath = os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") > > - FvOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", > os.path.normpath("FV/DXEFV.Fv")) > > + FvOutputDir = os.path.join(BuildDir, "{}_{}".format (BuildTarget, > ToolChain), os.path.normpath("FV/DXEFV.Fv")) > > PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt") > > ModuleReportPath = os.path.join(BuildDir, > "UefiUniversalPayloadEntry.txt") > > UpldInfoFile = os.path.join(BuildDir, "UniversalPayloadInfo.bin") > > @@ -94,14 +94,14 @@ def BuildUniversalPayload(Args, MacroList): > # > > # Building DXE core and DXE drivers as DXEFV. > > # > > - BuildPayload = f"build -p {DscPath} -b {BuildTarget} -a X64 -t > {ToolChain} -y {PayloadReportPath} {Quiet}" > > + BuildPayload = "build -p {} -b {} -a X64 -t {} -y {} {}".format > (DscPath, BuildTarget, ToolChain, PayloadReportPath, Quiet) > > BuildPayload += Pcds > > BuildPayload += Defines > > RunCommand(BuildPayload) > > # > > # Building Universal Payload entry. > > # > > - BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m > {EntryModuleInf} -t {ElfToolChain} -y > {ModuleReportPath} {Quiet}" > > + BuildModule = "build -p {} -b {} -a {} -m {} -t {} -y {} {}".format > (DscPath, BuildTarget, BuildArch, EntryModuleInf, > ElfToolChain, ModuleReportPath, Quiet) > > BuildModule += Pcds > > BuildModule += Defines > > RunCommand(BuildModule) > > @@ -118,9 +118,26 @@ def BuildUniversalPayload(Args, MacroList): > # > > # Copy the DXEFV as a section in elf format Universal Payload entry. > > # > > - remove_section = f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag} > --remove-section .upld_info --remove- > section .upld.uefi_fv {EntryOutputDir}' > > - add_section = f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag} > --add-section .upld_info={UpldInfoFile} --add- > section .upld.uefi_fv={FvOutputDir} {EntryOutputDir}' > > - set_section = f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyFlag} > --set-section-alignment .upld.upld_info=16 -- > set-section-alignment .upld.uefi_fv=16 {EntryOutputDir}' > > + remove_section = '"{}" -I {} -O {} --remove-section .upld_info > --remove-section .upld.uefi_fv {}'.format ( > > + LlvmObjcopyPath, > > + ObjCopyFlag, > > + ObjCopyFlag, > > + EntryOutputDir > > + ) > > + add_section = '"{}" -I {} -O {} --add-section .upld_info={} > --add-section .upld.uefi_fv={} {}'.format ( > > + LlvmObjcopyPath, > > + ObjCopyFlag, > > + ObjCopyFlag, > > + UpldInfoFile, > > + FvOutputDir, > > + EntryOutputDir > > + ) > > + set_section = '"{}" -I {} -O {} --set-section-alignment > .upld.upld_info=16 --set-section-alignment .upld.uefi_fv=16 > {}'.format ( > > + LlvmObjcopyPath, > > + ObjCopyFlag, > > + ObjCopyFlag, > > + EntryOutputDir > > + ) > > RunCommand(remove_section) > > RunCommand(add_section) > > RunCommand(set_section) > > -- > 2.32.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90740): https://edk2.groups.io/g/devel/message/90740 Mute This Topic: https://groups.io/mt/91958678/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
