[PATCH v2] UefiPayloadPkg: Backward support with python 3.6


Liu, KasimX <kasimx.liu@...>
 

@Ni, Ray

Thanks for the reply and reviewed-by.

I've created the PR, could you help me add push label when you're available. I think we're better to check in the solution.
https://github.com/tianocore/edk2/pull/3008

Thanks
Kasim

-----Original Message-----
From: Ni, Ray <ray.ni@...>
Sent: Friday, June 24, 2022 5:30 PM
To: Liu, KasimX <kasimx.liu@...>; devel@edk2.groups.io
Cc: Dong, Guo <guo.dong@...>; Lu, James <james.lu@...>; Guo, Gua <gua.guo@...>
Subject: RE: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6

Offline discussed with patch owner and got to know that it's a change to enable UefiPayloadPkg build in Ubuntu16 build servers.
I am ok with this patch.

Reviewed-by: Ray Ni <ray.ni@...>

-----Original Message-----
From: Ni, Ray
Sent: Friday, June 24, 2022 12:41 PM
To: Liu, KasimX <kasimx.liu@...>; devel@edk2.groups.io
Cc: Dong, Guo <guo.dong@...>; Lu, James <james.lu@...>;
Guo, Gua <gua.guo@...>
Subject: RE: [PATCH v2] UefiPayloadPkg: Backward support with python
3.6

Why use PY 3.6?
Even PY 3.8 is about to be deprecated by Python community.

-----Original Message-----
From: Liu, KasimX <kasimx.liu@...>
Sent: Friday, June 24, 2022 11:48 AM
To: devel@edk2.groups.io
Cc: Liu, KasimX <kasimx.liu@...>; Dong, Guo
<guo.dong@...>; Ni, Ray <ray.ni@...>; Lu, James
<james.lu@...>; Guo, Gua <gua.guo@...>
Subject: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6

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

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.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/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/UniversalPaylo
adEntry/DEBUG/UniversalPayloadEntry.dll"))

+ EntryOutputDir = os.path.join(BuildDir, "{}_{}".format
+ (BuildTarget, ElfToolChain),
os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPaylo
adEntry/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/UniversalPayl
oadEntry/DEBUG/UniversalPayloadEntry.dll"))

+ EntryOutputDir = os.path.join(BuildDir, "{}_{}".format
+ (BuildTarget, ElfToolChain),
os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPayl
oadEntry/DEBUG/UniversalPayloadEntry.dll"))



EntryModuleInf =
os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEn
try.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


Ni, Ray
 

Offline discussed with patch owner and got to know that it's a change to enable UefiPayloadPkg build
in Ubuntu16 build servers.
I am ok with this patch.

Reviewed-by: Ray Ni <ray.ni@...>

-----Original Message-----
From: Ni, Ray
Sent: Friday, June 24, 2022 12:41 PM
To: Liu, KasimX <kasimx.liu@...>; devel@edk2.groups.io
Cc: Dong, Guo <guo.dong@...>; Lu, James <james.lu@...>; Guo, Gua <gua.guo@...>
Subject: RE: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6

Why use PY 3.6?
Even PY 3.8 is about to be deprecated by Python community.

-----Original Message-----
From: Liu, KasimX <kasimx.liu@...>
Sent: Friday, June 24, 2022 11:48 AM
To: devel@edk2.groups.io
Cc: Liu, KasimX <kasimx.liu@...>; Dong, Guo <guo.dong@...>; Ni, Ray <ray.ni@...>; Lu, James
<james.lu@...>; Guo, Gua <gua.guo@...>
Subject: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6

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

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.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/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


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


Ni, Ray
 

Why use PY 3.6?
Even PY 3.8 is about to be deprecated by Python community.

-----Original Message-----
From: Liu, KasimX <kasimx.liu@...>
Sent: Friday, June 24, 2022 11:48 AM
To: devel@edk2.groups.io
Cc: Liu, KasimX <kasimx.liu@...>; Dong, Guo <guo.dong@...>; Ni, Ray <ray.ni@...>; Lu, James
<james.lu@...>; Guo, Gua <gua.guo@...>
Subject: [PATCH v2] UefiPayloadPkg: Backward support with python 3.6

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

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.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/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