From nobody Fri Dec 27 20:24:04 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Authentication-Results: mx.zoho.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1496757157932176.17926725518237; Tue, 6 Jun 2017 06:52:37 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id BEAFD21AE30D0; Tue, 6 Jun 2017 06:51:22 -0700 (PDT) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 9290F21AE30D0 for ; Tue, 6 Jun 2017 06:51:21 -0700 (PDT) Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Jun 2017 06:52:28 -0700 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.121]) by orsmga005.jf.intel.com with ESMTP; 06 Jun 2017 06:52:27 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.39,306,1493708400"; d="scan'208";a="109790366" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Tue, 6 Jun 2017 21:52:23 +0800 Message-Id: <1496757143-14088-1-git-send-email-yonghong.zhu@intel.com> X-Mailer: git-send-email 2.6.1.windows.1 Subject: [edk2] [Patch] BaseTools: Fix the bug use same FMP_PAYLOAD in different capsule file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liming Gao MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Fix the bug that use same FMP_PAYLOAD in different capsule file. Because in previous FMP generation, the FMP already be generated, so we don't need to regenerate again. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/GenFds/Capsule.py | 15 ++++++++++----- BaseTools/Source/Python/GenFds/CapsuleData.py | 3 +++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/BaseTools/Source/Python/GenFds/Capsule.py b/BaseTools/Source/P= ython/GenFds/Capsule.py index d025f0c..e03d789 100644 --- a/BaseTools/Source/Python/GenFds/Capsule.py +++ b/BaseTools/Source/Python/GenFds/Capsule.py @@ -1,9 +1,9 @@ ## @file # generate capsule # -# Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License # which accompanies this distribution. The full text of the license may = be found at # http://opensource.org/licenses/bsd-license.php @@ -139,10 +139,15 @@ class Capsule (CapsuleClassObject) : PreSize +=3D os.path.getsize(FileName) File =3D open(FileName, 'rb') Content.write(File.read()) File.close() for fmp in self.FmpPayloadList: + if fmp.Existed: + FwMgrHdr.write(pack('=3DQ', PreSize)) + PreSize +=3D len(fmp.Buffer) + Content.write(fmp.Buffer) + continue if fmp.ImageFile: for Obj in fmp.ImageFile: fmp.ImageFile =3D Obj.GenCapsuleSubItem() if fmp.VendorCodeFile: for Obj in fmp.VendorCodeFile: @@ -167,16 +172,16 @@ class Capsule (CapsuleClassObject) : dwLength =3D 4 + 2 + 2 + 16 + os.path.getsize(CapOutpu= tTmp) - os.path.getsize(CapInputFile) else: dwLength =3D 4 + 2 + 2 + 16 + 16 + 256 + 256 fmp.ImageFile =3D CapOutputTmp AuthData =3D [fmp.MonotonicCount, dwLength, WIN_CERT_REVIS= ION, WIN_CERT_TYPE_EFI_GUID, fmp.Certificate_Guid] - Buffer =3D fmp.GenCapsuleSubItem(AuthData) + fmp.Buffer =3D fmp.GenCapsuleSubItem(AuthData) else: - Buffer =3D fmp.GenCapsuleSubItem() + fmp.Buffer =3D fmp.GenCapsuleSubItem() FwMgrHdr.write(pack('=3DQ', PreSize)) - PreSize +=3D len(Buffer) - Content.write(Buffer) + PreSize +=3D len(fmp.Buffer) + Content.write(fmp.Buffer) BodySize =3D len(FwMgrHdr.getvalue()) + len(Content.getvalue()) Header.write(pack('=3DI', HdrSize + BodySize)) # # The real capsule header structure is 28 bytes # diff --git a/BaseTools/Source/Python/GenFds/CapsuleData.py b/BaseTools/Sour= ce/Python/GenFds/CapsuleData.py index 24c210d..5b806d9 100644 --- a/BaseTools/Source/Python/GenFds/CapsuleData.py +++ b/BaseTools/Source/Python/GenFds/CapsuleData.py @@ -181,10 +181,12 @@ class CapsulePayload(CapsuleData): self.HardwareInstance =3D None self.ImageFile =3D [] self.VendorCodeFile =3D [] self.Certificate_Guid =3D None self.MonotonicCount =3D None + self.Existed =3D False + self.Buffer =3D None =20 def GenCapsuleSubItem(self, AuthData=3D[]): if not self.Version: self.Version =3D '0x00000002' if not self.ImageIndex: @@ -237,6 +239,7 @@ class CapsulePayload(CapsuleData): ImageFile.close() if self.VendorCodeFile: VendorFile =3D open(self.VendorCodeFile, 'rb') Buffer +=3D VendorFile.read() VendorFile.close() + self.Existed =3D True return Buffer --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel