From nobody Thu May 2 07:40:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+90744+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+90744+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 165604885774657.23898670133735; Thu, 23 Jun 2022 22:34:17 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id 6e6cYY1788612x5UEDthK9Fa; Thu, 23 Jun 2022 22:34:17 -0700 X-Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.3700.1656042489989624487 for ; Thu, 23 Jun 2022 20:48:10 -0700 X-IronPort-AV: E=McAfee;i="6400,9594,10387"; a="261341217" X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="261341217" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Jun 2022 20:48:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,217,1650956400"; d="scan'208";a="678372681" X-Received: from jenkailx-win10.gar.corp.intel.com ([10.227.107.9]) by FMSMGA003.fm.intel.com with ESMTP; 23 Jun 2022 20:48:07 -0700 From: kasimx.liu@intel.com To: devel@edk2.groups.io Cc: KasimX Liu , Guo Dong , Ray Ni , James Lu , Gua Guo Subject: [edk2-devel] [PATCH v2] UefiPayloadPkg: Backward support with python 3.6 Date: Fri, 24 Jun 2022 11:47:49 +0800 Message-Id: <20220624034749.2978-1-kasimx.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kasimx.liu@intel.com X-Gm-Message-State: dbRE7DZL1rQXKA10h36RzrkXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1656048857; bh=KzOtT5nl80HfcvAZIQP+hy9Dz6LxXJZQvBxUZFrYLUk=; h=Cc:Date:From:Reply-To:Subject:To; b=r2tWZk84+NJh5B4qgDrQ05eIOJq85PP4dy0Xv8fv5x6YEsCbfTnwBthziAwc86yycHz AdJ8OjkRu/LYs9Hgy7y/5VRAYGQ+FqPAORBod9apJT0i6Ej3aiSFvskBMfsZvjIM5rCRk /DGb06LnkhN9matZzZ6A6FZA+0MelVjS2w8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1656048859369100003 Content-Type: text/plain; charset="utf-8" From: 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 Cc: Ray Ni Cc: James Lu Reviewed-by: Gua Guo Signed-off-by: KasimX Liu Reviewed-by: Ray Ni --- 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': BuildArch =3D "X64" ObjCopyFlag =3D "elf64-x86-64" - EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfTool= Chain}", os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/UniversalPay= loadEntry/DEBUG/UniversalPayloadEntry.dll")) + EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) else: BuildArch =3D "IA32 -a X64" ObjCopyFlag =3D "elf32-i386" - EntryOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ElfTool= Chain}", os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/UniversalPa= yloadEntry/DEBUG/UniversalPayloadEntry.dll")) + EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/= UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) =20 EntryModuleInf =3D os.path.normpath("UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry.inf") DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") - FvOutputDir =3D os.path.join(BuildDir, f"{BuildTarget}_{ToolChain}", o= s.path.normpath("FV/DXEFV.Fv")) + FvOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTarget, To= olChain), os.path.normpath("FV/DXEFV.Fv")) PayloadReportPath =3D os.path.join(BuildDir, "UefiUniversalPayload.txt= ") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") @@ -94,14 +94,14 @@ def BuildUniversalPayload(Args, MacroList): # # Building DXE core and DXE drivers as DXEFV. # - BuildPayload =3D f"build -p {DscPath} -b {BuildTarget} -a X64 -t {Tool= Chain} -y {PayloadReportPath} {Quiet}" + BuildPayload =3D "build -p {} -b {} -a X64 -t {} -y {} {}".format (Dsc= Path, BuildTarget, ToolChain, PayloadReportPath, Quiet) BuildPayload +=3D Pcds BuildPayload +=3D Defines RunCommand(BuildPayload) # # Building Universal Payload entry. # - BuildModule =3D f"build -p {DscPath} -b {BuildTarget} -a {BuildArch} -= m {EntryModuleInf} -t {ElfToolChain} -y {ModuleReportPath} {Quiet}" + BuildModule =3D "build -p {} -b {} -a {} -m {} -t {} -y {} {}".format = (DscPath, BuildTarget, BuildArch, EntryModuleInf, ElfToolChain, ModuleRepor= tPath, Quiet) BuildModule +=3D Pcds BuildModule +=3D 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 =3D f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyF= lag} --remove-section .upld_info --remove-section .upld.uefi_fv {EntryOutpu= tDir}' - add_section =3D f'"{LlvmObjcopyPath}" -I {ObjCopyFlag} -O {ObjCopyF= lag} --add-section .upld_info=3D{UpldInfoFile} --add-section .upld.uefi_fv= =3D{FvOutputDir} {EntryOutputDir}' - 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}' + remove_section =3D '"{}" -I {} -O {} --remove-section .upld_info --rem= ove-section .upld.uefi_fv {}'.format ( + LlvmObjcopyPath, + ObjCopyFlag, + ObjCopyFlag, + EntryOutputDir + ) + add_section =3D '"{}" -I {} -O {} --add-section .upld_info=3D{} --a= dd-section .upld.uefi_fv=3D{} {}'.format ( + LlvmObjcopyPath, + ObjCopyFlag, + ObjCopyFlag, + UpldInfoFile, + FvOutputDir, + EntryOutputDir + ) + set_section =3D '"{}" -I {} -O {} --set-section-alignment .upld.upl= d_info=3D16 --set-section-alignment .upld.uefi_fv=3D16 {}'.format ( + LlvmObjcopyPath, + ObjCopyFlag, + ObjCopyFlag, + EntryOutputDir + ) RunCommand(remove_section) RunCommand(add_section) RunCommand(set_section) --=20 2.32.0.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90744): https://edk2.groups.io/g/devel/message/90744 Mute This Topic: https://groups.io/mt/91958678/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-