From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 87B64AC0A6D for ; Fri, 25 Aug 2023 04:15:14 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=ngAp3pD/OLdbUqnxGA6mMg+ERI+BrVIcR3UcyyJ81XI=; 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=F1AtWCq9YJjOFar3XPFhseO5CoQa4wDKbh8f+CiZQncbM0+0X0lut8Ip3IHfjQ586m3rQSwn 8Hu43bV6z+2oumRu34ZVWpe/4W345kNFOMyGEt0aW727sax5N27ViNslgia9Z6Ve1TgcoQiGMss vBggZzLY0jQQqPo+MOr26uhM= X-Received: by 127.0.0.2 with SMTP id xQyqYY7687511xDhJbJlLfvB; 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: PZOyCTIjaXALa8oeocA6trstx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=F1AtWCq9; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io 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"))=0D BuildModule =3D ""=0D BuildArch =3D ""=0D + PreBuildUplOutput =3D os.path.join(BuildDir, os.path.normpath("UefiPay= loadBinPkg/Binaries"))=0D +=0D if Args.Arch =3D=3D 'X64':=0D BuildArch =3D "X64"=0D EntryOutputDir =3D os.path.join(BuildDir, "{}_{}".format (BuildTar= get, ElfToolChain), os.path.normpath("X64/UefiPayloadPkg/UefiPayloadEntry/U= niversalPayloadEntry/DEBUG/UniversalPayloadEntry.dll"))=0D @@ -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"))=0D =0D if Args.PreBuildUplBinary is not None:=0D - EntryOutputDir =3D os.path.abspath(Args.PreBuildUplBinary)=0D + if os.path.exists(PreBuildUplOutput) !=3D True:=0D + os.makedirs(PreBuildUplOutput)=0D + EntryOutputDir =3D os.path.join(BuildDir, PreBuildUplOutput, "Univ= ersalPayload.elf")=0D + shutil.copy (os.path.abspath(Args.PreBuildUplBinary), EntryOutputD= ir)=0D +=0D DscPath =3D os.path.normpath("UefiPayloadPkg/UefiPayloadPkg.dsc")=0D ModuleReportPath =3D os.path.join(BuildDir, "UefiUniversalPayloadEntry= .txt")=0D UpldInfoFile =3D os.path.join(BuildDir, "UniversalPayloadInfo.bin")=0D --=20 2.39.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- 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/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-