From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.groups.io with SMTP id smtpd.web10.9256.1679302411172334322 for ; Mon, 20 Mar 2023 01:53:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@9elements.com header.s=google header.b=K9ClD+Pg; spf=pass (domain: 9elements.com, ip: 209.85.128.51, mailfrom: patrick.rudolph@9elements.com) Received: by mail-wm1-f51.google.com with SMTP id p13-20020a05600c358d00b003ed346d4522so6974724wmq.2 for ; Mon, 20 Mar 2023 01:53:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; t=1679302409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eZ/zDaYHGCH3cVJhra6alQHbUqb0K0ONZ01oQA0PDpw=; b=K9ClD+Pgd9HCVtXOI28PFE0qoCTDdrbuSDf06RuS2hDiPlOY84q3/tS9N1cRPnR7ml S0OB6k5sOT0TPUOTUsyKRi3bm+poIOzUyiBHeZaeQUoYR9UoSNQBMEipPvN7inF0RYoQ QTKiXuc/ox4IIzQFkxq9Z5pWMVDIfQuEaQRspBP6KWIAkyif+gz0Hdt2W3C44k09wrzJ wyfNM1Ead2L6ZMMc7oTXqHM7KG/0vuZZDj5wC99CHhxJmI8AdADnuXhWjSVkogAhLQSA c+8Hc+1zucjIu3SgxMnU66DQWfzXFG5n4R0Ev9KNkBXVYkjp0bfcLWdpKcfqWlYkwkDT dBxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679302409; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eZ/zDaYHGCH3cVJhra6alQHbUqb0K0ONZ01oQA0PDpw=; b=u0EPoizdjfuY17X02ACjTKQOHqJluKuA3DwZVsjwz/J1EbW70LjCnMrEZOlztt5YCy +nCLlLzzDI9pan99lWvvIGnxxkT7DrTx4DZPNFnImz7UUgJIoeJ+gayRdPRl3zSSJkAG ze7PM1R25qFi87oUiG1Oe2w3dqa1Jxglm+nMQqQUTMa6ALUQkgL0aopCyFOKNpHzy6gb YCKwxMql66GrvQj355sw+Wgbb8Av7iJE1JUx8I+K05jEdmyhEqAcDrbuQOqbRODr0t3Q R0koWS6nzxaQN3dGszVOd14Sh0av6mlYe/mzk53k0t2M+WXzxfzPMjzowHg+27u7aJlc 5lMw== X-Gm-Message-State: AO0yUKVw9Ry0bE2TBuyvEU2nthEiZi3/rd/3MNxgJzSFgplsV1VIXyw/ UT8l4rDkVdkpT6OLaCfA7bTSnhWsHJWpyxbscDY= X-Google-Smtp-Source: AK7set+16IRL1kCBSQEvkKL5dk9ZvF1wW1ewA5gAlZh2pPetKxD/cprjk3LxXjl1VzgQdNO3wbRbJA== X-Received: by 2002:a05:600c:4f01:b0:3ed:31cf:fe6e with SMTP id l1-20020a05600c4f0100b003ed31cffe6emr15414691wmq.41.1679302409577; Mon, 20 Mar 2023 01:53:29 -0700 (PDT) Return-Path: Received: from fedora.sec.9e.network (ip-095-222-150-251.um34.pools.vodafone-ip.de. [95.222.150.251]) by smtp.gmail.com with ESMTPSA id p5-20020a05600c05c500b003edf2ae2432sm2562340wmd.7.2023.03.20.01.53.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Mar 2023 01:53:29 -0700 (PDT) From: "Patrick Rudolph" To: Cc: devel@edk2.groups.io, quic_llindhol@quicinc.com, michael.d.kinney@intel.com, rangasai.v.chaganty@intel.com, isaac.w.oram@intel.com, nathaniel.l.desimone@intel.com, gaoliming@byosoft.com.cn Subject: [edk2-platforms][PATCH 2/2][RESEND] PlatformPayloadFeaturePkg.py: Add Linux support Date: Mon, 20 Mar 2023 09:53:27 +0100 Message-Id: <20230320085327.1387588-2-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230320085327.1387588-1-patrick.rudolph@9elements.com> References: <20230320085327.1387588-1-patrick.rudolph@9elements.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable - 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 Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4358 --- Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePkg.py | 4 = ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeatur= ePkg.py b/Features/Intel/PlatformPayloadFeaturePkg/PlatformPayloadFeaturePk= g.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=0D #=0D Edk2PayloadBuildScript =3D os.path.normpath("UefiPayloadPkg/UniversalP= ayloadBuild.py")=0D - for package_path in os.environ['PACKAGES_PATH'].split(';'):=0D + for package_path in os.environ['PACKAGES_PATH'].split(os.pathsep):=0D if os.path.exists (os.path.join (package_path, Edk2PayloadBuildScr= ipt)):=0D Edk2PayloadBuildScript =3D os.path.join (package_path, Edk2Pay= loadBuildScript)=0D break=0D @@ -49,7 +49,7 @@ def BuildUniversalPayload(Args, MacroList): BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/UefiPayloadPkgX64"))=0D PlatformFvReportPath =3D os.path.join(BuildDir, "PlatformPayloadRepo= rt.txt")=0D UniversalUefiPld =3D os.path.join(BuildDir, 'UniversalPayload.el= f')=0D - PlatformFv =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}= ", os.path.normpath("FV/PlatformPayload.Fv"))=0D + PlatformFv =3D os.path.join(os.environ['WORKSPACE'], os.pa= th.normpath("Build/PlatformPayloadFeaturePkg"), f"{BuildTarget}_{ToolChain}= ", os.path.normpath("FV/PLATFORMPAYLOAD.Fv"))=0D =0D if "CLANG_BIN" in os.environ:=0D LlvmObjcopyPath =3D os.path.join(os.environ["CLANG_BIN"], "llvm-ob= jcopy")=0D --=20 2.39.1