From nobody Wed May 15 23:43:54 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+108037+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+108037+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692975501; cv=none; d=zohomail.com; s=zohoarc; b=e6K7gHesitYLm8Qv3XM5UiQBWQgP3WEbzzq1fn8D6BXccuQDzD9OSM4JLvgglm+PANbQtdaDWTw+KqEkxUpAtEglPSdYHKUbiioWDlfuQhCCwVvT5lax5bjZCHEW7VE5hPtJpMEyeNppTRwIFl6zcBeR19hOGiN4vhX7Hw6OXxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692975501; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Sender:Subject:To; bh=VTQviFa7e0DoiGypnpfuRKnipcaa9Udv/VmgT7D+B0w=; b=mNgyafKzagnTU1W9e7feoNMMLnzCUw3QriVdFsWO4eKHU82Yx5XI/JCWwXnGrqJ3f2AAAKnqvLQEfkiROpsE8dLi/WHmrWR8Aa4ieQcbhJ/+2fFH7z5wCUKPlYdr1YxHDlPcbeNxu813aseEUd1edlhnSOlwH2Te0k/c1zJDn5U= ARC-Authentication-Results: i=1; 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+108037+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1692975501054187.6094862201993; Fri, 25 Aug 2023 07:58:21 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=3LFtwXtMhfPRkd9xZpfeqt462cDR4kyAshKlh++Ga9w=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1692975500; v=1; b=rMUHNptmjo/kq9ddCg7fXD3ylKuhb8BgTLtSF20AfQDbvkePNGRnzQFVaoQ2MMNol67aEfeR jTwqvSpTvDGn+a/MhCPjdkqE3aUs+suZh5YaANsujvbdBlZq5OmOrI7Tdsb/HjNIwrLVx7GNEEb jbZdmN4PUB1JvEtuOGsrZegk= X-Received: by 127.0.0.2 with SMTP id 1Ds7YY1788612xAxo1LllAZo; Fri, 25 Aug 2023 07:58:20 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.8293.1692946881776850921 for ; Fri, 25 Aug 2023 00:01:22 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="461012637" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="461012637" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Aug 2023 00:00:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="730931469" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="730931469" X-Received: from jenkailx-desk1.gar.corp.intel.com ([10.227.107.51]) by orsmga007.jf.intel.com with ESMTP; 25 Aug 2023 00:00:54 -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:Enhance the build processing for Universalpayload Date: Fri, 25 Aug 2023 15:00:50 +0800 Message-Id: <20230825070050.1092-1-kasimx.liu@intel.com> MIME-Version: 1.0 Precedence: Bulk 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 List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: r16sih6JQGQhDguzMPr8R34Dx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1692975501843100001 Content-Type: text/plain; charset="utf-8" From: KasimX Liu REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4532 To Copy the PrebuildUplBinary to Build folder then add/replace Fvs. Cc: Guo Dong Cc: Ray Ni Cc: James Lu Cc: Gua Guo Signed-off-by: KasimX Liu --- UefiPayloadPkg/UniversalPayloadBuild.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UniversalPayloadBuild.py b/UefiPayloadPkg/Unive= rsalPayloadBuild.py index ecc25dad83..3c3c27f58e 100644 --- a/UefiPayloadPkg/UniversalPayloadBuild.py +++ b/UefiPayloadPkg/UniversalPayloadBuild.py @@ -58,6 +58,8 @@ def BuildUniversalPayload(Args): BuildDir =3D os.path.join(os.environ['WORKSPACE'], os.path.normpat= h("Build/UefiPayloadPkgX64")) BuildModule =3D "" BuildArch =3D "" + PreBuildUplOutput =3D os.path.join(BuildDir, os.path.normpath("Binarie= s")) + if Args.Arch =3D=3D 'X64': BuildArch =3D "X64" EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) @@ -66,7 +68,11 @@ def BuildUniversalPayload(Args): EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("IA32/UefiPayloadPkg/UefiPayloadEntry/= UniversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll")) =20 if Args.PreBuildUplBinary is not None: - EntryOutputDir =3D os.path.abspath(Args.PreBuildUplBinary) + if os.path.exists(PreBuildUplOutput) !=3D True: + os.makedirs(PreBuildUplOutput) + EntryOutputDir =3D os.path.join(BuildDir, PreBuildUplOutput, "Univ= ersalPayload.elf") + shutil.copy (os.path.abspath(Args.PreBuildUplBinary), EntryOutputD= ir) + DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc") ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt") UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin") --=20 2.39.1.windows.1 -=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 (#108037): https://edk2.groups.io/g/devel/message/108037 Mute This Topic: https://groups.io/mt/100952717/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-