From nobody Mon Dec 23 05:19:57 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.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 1520010550955732.6823417415974; Fri, 2 Mar 2018 09:09:10 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 4FEAF2249273A; Fri, 2 Mar 2018 09:02:59 -0800 (PST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (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 E877B22402DF4 for ; Fri, 2 Mar 2018 09:02:57 -0800 (PST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Mar 2018 09:09:07 -0800 Received: from shwdeopenpsi168.ccr.corp.intel.com ([10.239.158.129]) by FMSMGA003.fm.intel.com with ESMTP; 02 Mar 2018 09:09:06 -0800 X-Original-To: edk2-devel@lists.01.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; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=134.134.136.31; helo=mga06.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,413,1515484800"; d="scan'208";a="30983614" From: Yonghong Zhu To: edk2-devel@lists.01.org Date: Sat, 3 Mar 2018 01:09:03 +0800 Message-Id: <1520010543-14416-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 to search Fv.txt file relative to workspace X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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" when the SECTION FV_IMAGE =3D $(XX)/XX.Fv, the Fv file should relative to WORKSPACE, so when we search the XX.Fv.txt file, we should search the path relative to workspace first. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yonghong Zhu Reviewed-by: Liming Gao --- BaseTools/Source/Python/build/BuildReport.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Sourc= e/Python/build/BuildReport.py index b2cc6ee..2fb6ad0 100644 --- a/BaseTools/Source/Python/build/BuildReport.py +++ b/BaseTools/Source/Python/build/BuildReport.py @@ -1621,10 +1621,11 @@ class FdRegionReport(object): self.Size =3D FdRegion.Size self.FvList =3D [] self.FvInfo =3D {} self._GuidsDb =3D {} self._FvDir =3D Wa.FvDir + self._WorkspaceDir =3D Wa.WorkspaceDir =20 # # If the input FdRegion is not a firmware volume, # we are done. # @@ -1724,17 +1725,19 @@ class FdRegionReport(object): =20 if self.Type =3D=3D "FV": FvTotalSize =3D 0 FvTakenSize =3D 0 FvFreeSize =3D 0 - if not os.path.isfile(FvName): - FvReportFileName =3D os.path.join(self._FvDir, FvName + ".= Fv.txt") + if FvName.upper().endswith('.FV'): + FileExt =3D FvName + ".txt" else: - if FvName.upper().endswith('.FV'): - FvReportFileName =3D FvName + ".txt" - else: - FvReportFileName =3D FvName + ".Fv.txt" + FileExt =3D FvName + ".Fv.txt" + + if not os.path.isfile(FileExt): + FvReportFileName =3D mws.join(self._WorkspaceDir, FileExt) + if not os.path.isfile(FvReportFileName): + FvReportFileName =3D os.path.join(self._FvDir, FileExt) try: # # Collect size info in the firmware volume. # FvReport =3D open(FvReportFileName).read() --=20 2.6.1.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel