From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.115; helo=mga14.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org 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 0708C222EDCCE for ; Tue, 2 Jan 2018 03:46:09 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Jan 2018 03:51:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,496,1508828400"; d="scan'208";a="18351489" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga001.fm.intel.com with ESMTP; 02 Jan 2018 03:51:11 -0800 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 2 Jan 2018 03:51:11 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 2 Jan 2018 03:51:11 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Tue, 2 Jan 2018 19:51:09 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" Thread-Topic: [edk2] [Patch] BaseTools: Fix the regression bug of a74398 for SubFv Image Thread-Index: AQHTg7qCUTlWnzc5kkiECqnYqdjVRqNgeHsw Date: Tue, 2 Jan 2018 11:51:08 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E19D1AD@SHSMSX104.ccr.corp.intel.com> References: <1514891503-8204-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1514891503-8204-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] BaseTools: Fix the regression bug of a74398 for SubFv Image 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: , X-List-Received-Date: Tue, 02 Jan 2018 11:46:10 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Yo= nghong Zhu > Sent: Tuesday, January 2, 2018 7:12 PM > To: edk2-devel@lists.01.org > Subject: [edk2] [Patch] BaseTools: Fix the regression bug of a74398 for S= ubFv Image >=20 > in version a74398 we use guid value and Fv name as ffs dir for FILE > statement, this patch apply this rule on subFv image. >=20 > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/GenFds/Fv.py | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Pyth= on/GenFds/Fv.py > index a69abb3..c0b869d 100644 > --- a/BaseTools/Source/Python/GenFds/Fv.py > +++ b/BaseTools/Source/Python/GenFds/Fv.py > @@ -1,9 +1,9 @@ > ## @file > # process FV generation > # > -# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved. > +# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved. > # > # This program and the accompanying materials > # are licensed and made available under the terms and conditions of the= BSD License > # which accompanies this distribution. The full text of the license ma= y be found at > # http://opensource.org/licenses/bsd-license.php > @@ -177,11 +177,11 @@ class FV (FvClassObject): > AddFileObj.close() >=20 > if FvChildAddr !=3D []: > # Update Ffs again > for FfsFile in self.FfsList : > - FileName =3D FfsFile.GenFfs(MacroDict, FvChildAd= dr, BaseAddress, IsMakefile=3DFlag) > + FileName =3D FfsFile.GenFfs(MacroDict, FvChildAd= dr, BaseAddress, IsMakefile=3DFlag, > FvName=3Dself.UiFvName) >=20 > if GenFdsGlobalVariable.LargeFileInFvFlags[-1]: > FFSGuid =3D GenFdsGlobalVariable.EFI_FIRMWARE_FI= LE_SYSTEM3_GUID; > #Update GenFv again > GenFdsGlobalVariable.GenerateFirmwareVolume( > -- > 2.6.1.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel