* [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 [not found] <31008ef5ec72bb5f96a1c21f71ba127b6aa9bafe.1648585893.git.sean@starlabs.systems> @ 2022-03-29 20:31 ` Sean Rhodes 2022-03-31 6:14 ` [edk2-devel] " Ni, Ray 2022-03-29 20:31 ` [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script Sean Rhodes 1 sibling, 1 reply; 4+ messages in thread From: Sean Rhodes @ 2022-03-29 20:31 UTC (permalink / raw) To: devel; +Cc: Sean Rhodes Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UniversalPayloadBuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index ac965766c7..1b99eeff34 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -60,7 +60,7 @@ def BuildUniversalPayload(Args, MacroList): DscPath = os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") BuildDir = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64")) FvOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/DXEFV.Fv")) - EntryOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChain}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) + EntryOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChain}", f"{Args.Arch}", os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt") ModuleReportPath = os.path.join(BuildDir, "UefiUniversalPayloadEntry.txt") UpldInfoFile = os.path.join(BuildDir, "UniversalPayloadInfo.bin") -- 2.32.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 2022-03-29 20:31 ` [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 Sean Rhodes @ 2022-03-31 6:14 ` Ni, Ray 0 siblings, 0 replies; 4+ messages in thread From: Ni, Ray @ 2022-03-31 6:14 UTC (permalink / raw) To: devel@edk2.groups.io, Rhodes, Sean Reviewed-by: Ray Ni <ray.ni@intel.com> -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes Sent: Wednesday, March 30, 2022 4:32 AM To: devel@edk2.groups.io Cc: Rhodes, Sean <sean@starlabs.systems> Subject: [edk2-devel] [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UniversalPayloadBuild.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index ac965766c7..1b99eeff34 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -60,7 +60,7 @@ def BuildUniversalPayload(Args, MacroList): DscPath = os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") BuildDir = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64")) FvOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/DXEFV.Fv")) - EntryOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChain}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) + EntryOutputDir = os.path.join(BuildDir, f"{BuildTarget}_{ElfToolChain}", f"{Args.Arch}", os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) PayloadReportPath = os.path.join(BuildDir, "UefiUniversalPayload.txt") ModuleReportPath = os.path.join(BuildDir, "UefiUniversalPayloadEntry.txt") UpldInfoFile = os.path.join(BuildDir, "UniversalPayloadInfo.bin") -- 2.32.0 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#88204): https://edk2.groups.io/g/devel/message/88204 Mute This Topic: https://groups.io/mt/90117695/1712937 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ray.ni@intel.com] -=-=-=-=-=-= ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script [not found] <31008ef5ec72bb5f96a1c21f71ba127b6aa9bafe.1648585893.git.sean@starlabs.systems> 2022-03-29 20:31 ` [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 Sean Rhodes @ 2022-03-29 20:31 ` Sean Rhodes 2022-03-31 6:16 ` [edk2-devel] " Ni, Ray 1 sibling, 1 reply; 4+ messages in thread From: Sean Rhodes @ 2022-03-29 20:31 UTC (permalink / raw) To: devel; +Cc: Sean Rhodes Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UniversalPayloadBuild.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index 1b99eeff34..61423e5908 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -54,6 +54,7 @@ def BuildUniversalPayload(Args, MacroList): BuildTarget = Args.Target ToolChain = Args.ToolChain BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64" + Quiet = "-q" if Args.Quiet else " " ElfToolChain = 'CLANGDWARF' EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf") @@ -82,13 +83,13 @@ 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}" + BuildPayload = f"build -p {DscPath} -b {BuildTarget} -a X64 -t {ToolChain} -y {PayloadReportPath} {Quiet}" BuildPayload += Defines RunCommand(BuildPayload) # # Building Universal Payload entry. # - BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}" + BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath} {Quiet}" BuildModule += Defines RunCommand(BuildModule) @@ -120,6 +121,7 @@ def main(): parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify the ARCH for payload entry module. Default build X64 image.', default ='X64') parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"]) parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI') + parser.add_argument('-q', "--Quiet", help="Less verbose output", action='store_true') MacroList = {} args = parser.parse_args() if args.Macro is not None: -- 2.32.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [edk2-devel] [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script 2022-03-29 20:31 ` [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script Sean Rhodes @ 2022-03-31 6:16 ` Ni, Ray 0 siblings, 0 replies; 4+ messages in thread From: Ni, Ray @ 2022-03-31 6:16 UTC (permalink / raw) To: devel@edk2.groups.io, Rhodes, Sean Reviewed-by: Ray Ni <ray.ni@intel.com> -----Original Message----- From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sean Rhodes Sent: Wednesday, March 30, 2022 4:32 AM To: devel@edk2.groups.io Cc: Rhodes, Sean <sean@starlabs.systems> Subject: [edk2-devel] [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script Signed-off-by: Sean Rhodes <sean@starlabs.systems> --- UefiPayloadPkg/UniversalPayloadBuild.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/UniversalPayloadBuild.py index 1b99eeff34..61423e5908 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -54,6 +54,7 @@ def BuildUniversalPayload(Args, MacroList): BuildTarget = Args.Target ToolChain = Args.ToolChain BuildArch = "X64" if Args.Arch == 'X64' else "IA32 -a X64" + Quiet = "-q" if Args.Quiet else " " ElfToolChain = 'CLANGDWARF' EntryModuleInf = os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf") @@ -82,13 +83,13 @@ 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}" + BuildPayload = f"build -p {DscPath} -b {BuildTarget} -a X64 -t {ToolChain} -y {PayloadReportPath} {Quiet}" BuildPayload += Defines RunCommand(BuildPayload) # # Building Universal Payload entry. # - BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath}" + BuildModule = f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath} {Quiet}" BuildModule += Defines RunCommand(BuildModule) @@ -120,6 +121,7 @@ def main(): parser.add_argument('-a', '--Arch', choices=['IA32', 'X64'], help='Specify the ARCH for payload entry module. Default build X64 image.', default ='X64') parser.add_argument("-D", "--Macro", action="append", default=["UNIVERSAL_PAYLOAD=TRUE"]) parser.add_argument('-i', '--ImageId', type=str, help='Specify payload ID (16 bytes maximal).', default ='UEFI') + parser.add_argument('-q', "--Quiet", help="Less verbose output", action='store_true') MacroList = {} args = parser.parse_args() if args.Macro is not None: -- 2.32.0 -=-=-=-=-=-= Groups.io Links: You receive all messages sent to this group. View/Reply Online (#88205): https://edk2.groups.io/g/devel/message/88205 Mute This Topic: https://groups.io/mt/90117696/1712937 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [ray.ni@intel.com] -=-=-=-=-=-= ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-03-31 6:16 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- [not found] <31008ef5ec72bb5f96a1c21f71ba127b6aa9bafe.1648585893.git.sean@starlabs.systems> 2022-03-29 20:31 ` [PATCH 2/3] UefiPayloadPkg: Fix build on IA32 Sean Rhodes 2022-03-31 6:14 ` [edk2-devel] " Ni, Ray 2022-03-29 20:31 ` [PATCH 3/3] UefiPayloadPkg: Add --quiet argument to Universal Payload build script Sean Rhodes 2022-03-31 6:16 ` [edk2-devel] " Ni, Ray
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox