From nobody Thu May 16 12:57:48 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+108030+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+108030+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1692936913; cv=none; d=zohomail.com; s=zohoarc; b=N7028elrPkMdWSLr1POgp5gK4oxb08rbDq4bQVxQ6PZzNnUiux3lOgY42cGHyW9WfzsntlrUVJxyXPoo9Hhd/vxwcFtwDX1pwUvWynXfidaY20bPGjYAHz69UJdKiVC3ZgKXnvr7KbpaMv/QfYGH7zdWTXuA6uAtRbfS0oPNVUo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1692936913; 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=I/9brD7GC/5bwmq870I2Pi4rhrIL7gAovyjU2DyTmYg=; b=f2T8TNEEiP43kHGMXflkJbCAh/rq7GmaOyN+BdtsZ1tGf35p/AWBHkvgl2ZJlTSgnSv+lrL5rQvxk1q6YK3UocfBKU5PVJD0XY6zdQP7mDmm6EdnRwf4nnJyrCab4uPrKg/eTo/cf7sFhD3kc6PUNl09k+iIZbzCOpvObkYFitA= 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+108030+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 1692936913682421.0756916715277; Thu, 24 Aug 2023 21:15:13 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=tft975ilwP1tY9DmhMV6cxMaDyPu94fO6JzTsX2oXT0=; 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=1692936913; v=1; b=Ok5sGDqjgOYtH1I1r4MjYz8LXoxdQl28jtQfNQPYDsbCRmaDDE+uaDszLikwbcZHUYLj0MLQ /Ju54+3vKvwkK7uRoADlvWKaNvOvpGBo4Qh1iIjsCqp+sVPo6GzsRBIexRGqMZRluTOwdsIrP4a x36d5fFn2i2FplanrkMeo7ss= X-Received: by 127.0.0.2 with SMTP id TfJPYY1788612xMvzgjYqFMs; Thu, 24 Aug 2023 21:15:13 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.6719.1692936469796695684 for ; Thu, 24 Aug 2023 21:07:50 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="460987375" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="460987375" X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Aug 2023 21:07:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10812"; a="827438753" X-IronPort-AV: E=Sophos;i="6.02,195,1688454000"; d="scan'208";a="827438753" X-Received: from jenkailx-desk1.gar.corp.intel.com ([10.227.107.51]) by FMSMGA003.fm.intel.com with ESMTP; 24 Aug 2023 21:07:47 -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] UefiPayloadPkg:Enhance the build processing for Universalpayload Date: Fri, 25 Aug 2023 12:07:42 +0800 Message-Id: <48ac1b3039e1115731598e3f48ab643daf69a537.1692936275.git.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: HU8mJ3tBOFptEjQiRwtq8djVx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1692936914322100003 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..6c6c37b3ca 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("UefiPay= loadBinPkg/Binaries")) + 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 (#108030): https://edk2.groups.io/g/devel/message/108030 Mute This Topic: https://groups.io/mt/100950168/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-