[edk2-devel] [edk2-platforms][PATCH 2/2][RESEND] PlatformPayloadFeaturePkg.py: Add Linux support

[Isaac Oram]

Pushed as 8efa4f42b5..d7466862b7

-----Original Message-----
From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Isaac Oram
Sent: Tuesday, March 21, 2023 12:33 PM
To: Rudolph, Patrick <patrick.rudolph at 9elements.com>
Cc: devel at edk2.groups.io; quic_llindhol at quicinc.com; Kinney, Michael D <michael.d.kinney at intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty at intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Gao, Liming <gaoliming at byosoft.com.cn>; Dong, Guo <guo.dong at intel.com>
Subject: Re: [edk2-devel] [edk2-platforms][PATCH 2/2][RESEND] PlatformPayloadFeaturePkg.py: Add Linux support

Reviewed-by: Isaac Oram <isaac.w.oram at intel.com>

In the future, please CC maintainers from https://github.com/iworam/edk2-platforms/blob/master/Maintainers.txt in the commit messages.


-----Original Message-----
From: Patrick Rudolph <patrick.rudolph at 9elements.com> 
Sent: Monday, March 20, 2023 1:53 AM
Cc: devel at edk2.groups.io; quic_llindhol at quicinc.com; Kinney, Michael D <michael.d.kinney at intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty at intel.com>; Oram, Isaac W <isaac.w.oram at intel.com>; Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Gao, Liming <gaoliming at byosoft.com.cn>
Subject: [edk2-platforms][PATCH 2/2][RESEND] PlatformPayloadFeaturePkg.py: Add Linux support

- Use OS specific path seperator instead of hardcoding ';'
- Fix case of build artifact FV/PLATFORMPAYLOAD.Fv

Test:
python Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py
works on Linux.

Signed-off-by: Patrick Rudolph <patrick.rudolph at 9elements.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4358
---
 Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py
index 2fbb8215..51aa8de5 100644
--- a/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py
+++ b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py
@@ -38,7 +38,7 @@ def BuildUniversalPayload(Args, MacroList):
     # Find universal UEFI payload build build script

     #

     Edk2PayloadBuildScript = os.path.normpath("UefiPayloadPkg/UniversalPayloadBuild.py")

-    for package_path in os.environ['PACKAGES_PATH'].split(';'):

+    for package_path in os.environ['PACKAGES_PATH'].split(os.pathsep):

         if os.path.exists (os.path.join (package_path, Edk2PayloadBuildScript)):

             Edk2PayloadBuildScript = os.path.join (package_path, Edk2PayloadBuildScript)

             break

@@ -49,7 +49,7 @@ def BuildUniversalPayload(Args, MacroList):
     BuildDir               = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/UefiPayloadPkgX64"))

     PlatformFvReportPath   = os.path.join(BuildDir, "PlatformPayloadReport.txt")

     UniversalUefiPld       = os.path.join(BuildDir, 'UniversalPayload.elf')

-    PlatformFv             = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PlatformPayload.Fv"))

+    PlatformFv             = os.path.join(os.environ['WORKSPACE'], os.path.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}", os.path.normpath("FV/PLATFORMPAYLOAD.Fv"))

 

     if "CLANG_BIN" in os.environ:

         LlvmObjcopyPath = os.path.join(os.environ["CLANG_BIN"], "llvm-objcopy")

-- 
2.39.1








-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#101502): https://edk2.groups.io/g/devel/message/101502
Mute This Topic: https://groups.io/mt/97727098/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-