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 9A814AC1687 for ; Wed, 29 Nov 2023 15:53:16 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=kglCu9NUzyNcDeDJvP9gbIBI/L936W/YxpUz0DhhYcg=; c=relaxed/simple; d=groups.io; h=From:To:Cc:References:In-Reply-To:Subject:Date:Message-ID:MIME-Version:Thread-Index:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Type:Content-Transfer-Encoding:Content-Language; s=20140610; t=1701273195; v=1; b=PxGyR9QkqGRHrzdTNu+WmwDjKzfR+bak6ckBiTq1vAz6riOEqtJ7Xql2MRkDfPDphsIj2p4F 13OBYq4A393HwvpGZX2Koyp4n//SnVrZycl6Qtp2r/u+AZH2NBIiGld7ssmBW5kon5gENXr+J16 USDF6q+qgt8vsmIv3LKOjaDM= X-Received: by 127.0.0.2 with SMTP id AOxgYY7687511xYcuaCNKdMm; Wed, 29 Nov 2023 07:53:15 -0800 X-Received: from zrleap.intel-email.com (zrleap.intel-email.com [114.80.218.36]) by mx.groups.io with SMTP id smtpd.web10.40295.1701273193098664147 for ; Wed, 29 Nov 2023 07:53:13 -0800 X-Received: from zrleap.intel-email.com (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id 7A40EA32E0BF for ; Wed, 29 Nov 2023 23:53:09 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by zrleap.intel-email.com (Postfix) with ESMTP id 5D1BFA32E0B4 for ; Wed, 29 Nov 2023 23:53:09 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by zrleap.intel-email.com (Postfix) with SMTP id 80678A32E09F for ; Wed, 29 Nov 2023 23:53:06 +0800 (CST) X-Received: from DESKTOPS6D0PVI ([114.93.194.54]) (envelope-sender ) by 192.168.6.13 with ESMTP(SSL) for ; Wed, 29 Nov 2023 23:53:00 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 114.93.194.54 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: , , "'Feng, Bob C'" Cc: "'Rebecca Cran'" , "'Guo, Gua'" References: <20230629033420.872-1-yuwei.chen@intel.com> <046601d9db1d$fdb03b60$f910b220$@byosoft.com.cn> <1783B3A3A09571FB.23877@groups.io> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIFYyIDEvNF0gQmFzZVRvb2xzOiBmaXhpbmcgRk1NVCBTaHJpbmtGdiBpc3N1ZQ==?= Date: Wed, 29 Nov 2023 23:53:01 +0800 Message-ID: <046b01da22dc$2221f050$6665d0f0$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQJ/u0azJS3m3Dm2ofnHecjJWqzL7gEejPMNAn/VDLQCyXChhAFpoIinrwe14+A= 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,gaoliming@byosoft.com.cn List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: 9x694PgMQlrXhPEePGEqHQt4x7686176AA= Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=PxGyR9Qk; dmarc=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 Yuwei: Please update commit message with reviewed-by info, then I will add push = label for this patch set.=20 Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io = =E4=BB=A3=E8=A1=A8 Yuwei Chen > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B411=E6=9C=8829=E6=97=A5= 16:26 > =E6=94=B6=E4=BB=B6=E4=BA=BA: Gao, Liming ; Feng= , Bob C > > =E6=8A=84=E9=80=81: 'Rebecca Cran' ; devel@edk2.groups= .io; Chen, > Christine ; Guo, Gua > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMM= T ShrinkFv issue >=20 > Hi Liming and Cran, >=20 > I have created the Edk2 PR for this one: > https://github.com/tianocore/edk2/pull/5009 > As it has been reviewed, please help merge that. Thanks~ >=20 > Thanks, > Yuwei (Christine) >=20 > > -----Original Message----- > > From: devel@edk2.groups.io On Behalf Of Yuwei > > Chen > > Sent: Monday, September 11, 2023 9:23 AM > > To: Gao, Liming ; devel@edk2.groups.io; Feng, > > Bob C > > Cc: 'Rebecca Cran' > > Subject: Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkF= v > > issue > > > > Thanks liming~ Hope it will be merged soon~ =F0=9F=98=8A > > > > Many thanks, > > Christine > > > > > -----Original Message----- > > > From: gaoliming > > > Sent: Wednesday, August 30, 2023 4:43 PM > > > To: devel@edk2.groups.io; Feng, Bob C ; Chen, > > > Christine > > > Cc: 'Rebecca Cran' > > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [Patch V2 1/4] BaseTools: f= ixing FMMT > > > ShrinkFv issue > > > > > > Christine: > > > I have no comments for this patch set. Reviewed-by: Liming Gao > > > > > > > > > Thanks > > > Liming > > > > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > > > > =E5=8F=91=E4=BB=B6=E4=BA=BA: devel@edk2.groups.io =E4=BB=A3=E8=A1=A8 Bob > Feng > > > > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B46=E6=9C=8829=E6= =97=A5 14:54 > > > > =E6=94=B6=E4=BB=B6=E4=BA=BA: Chen, Christine = ; > devel@edk2.groups.io > > > > =E6=8A=84=E9=80=81: Rebecca Cran ; Gao, Liming > > > > > > > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixi= ng FMMT ShrinkFv > > > issue > > > > > > > > Reviewed-by: Bob Feng > > > > > > > > -----Original Message----- > > > > From: Chen, Christine > > > > Sent: Thursday, June 29, 2023 11:34 AM > > > > To: devel@edk2.groups.io > > > > Cc: Rebecca Cran ; Gao, Liming > > > > ; Feng, Bob C > > > > Subject: [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv issue > > > > > > > > 1. FvLength not change issue; > > > > 2. FileSystemGuid align with File Size; > > > > > > > > Cc: Rebecca Cran > > > > Cc: Liming Gao > > > > Cc: Bob Feng > > > > Signed-off-by: Yuwei Chen > > > > --- > > > > BaseTools/Source/Python/FMMT/core/FMMTOperation.py | 2 +- > > > > BaseTools/Source/Python/FMMT/core/FvHandler.py | 10 > +++++++--- > > > > 2 files changed, 8 insertions(+), 4 deletions(-) > > > > > > > > diff --git a/BaseTools/Source/Python/FMMT/core/FMMTOperation.py > > > > b/BaseTools/Source/Python/FMMT/core/FMMTOperation.py > > > > index a86f8dda9a1a..d4aa3397036d 100644 > > > > --- a/BaseTools/Source/Python/FMMT/core/FMMTOperation.py > > > > +++ b/BaseTools/Source/Python/FMMT/core/FMMTOperation.py > > > > @@ -188,7 +188,7 @@ def ExtractFfs(inputfile: str, Ffs_name: str, > > > outputfile: > > > > str, Fv_name: str=3DNone > > > > > > > > > FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findli > > > > st > > > > [i > > > > ndex]) > > > > if FmmtParser.WholeFvTree.Findlist !=3D []: > > > > TargetNode =3D FmmtParser.WholeFvTree.Findlist[0] > > > > - if TargetNode.type =3D=3D FV_TREE or SEC_FV_TREE or > > > > DATA_FV_TREE: > > > > + if TargetNode.type =3D=3D FV_TREE or TargetNode.type =3D= =3D > > > > SEC_FV_TREE or TargetNode.type =3D=3D DATA_FV_TREE: > > > > FinalData =3D struct2stream(TargetNode.Data.Header) + > > > > TargetNode.Data.Data > > > > with open(outputfile, "wb") as f: > > > > f.write(FinalData) > > > > diff --git a/BaseTools/Source/Python/FMMT/core/FvHandler.py > > > > b/BaseTools/Source/Python/FMMT/core/FvHandler.py > > > > index ff3d637623f8..b0cc1951a1c6 100644 > > > > --- a/BaseTools/Source/Python/FMMT/core/FvHandler.py > > > > +++ b/BaseTools/Source/Python/FMMT/core/FvHandler.py > > > > @@ -279,7 +279,7 @@ class FvHandler: > > > > > ParTree.Child.remove(ParTree.Child[-1]) > > > > ParTree.Data.Free_Space =3D 0 > > > > ParTree.Data.Size +=3D Needed_Space > > > > - ParTree.Data.Header.Fvlength =3D > > > > ParTree.Data.Size > > > > + ParTree.Data.Header.FvLength =3D > > > > ParTree.Data.Size > > > > ModifyFvSystemGuid(ParTree) > > > > for item in ParTree.Child: > > > > if item.type =3D=3D FFS_FREE_SPACE: > > > > @@ -650,8 +650,12 @@ class FvHandler: > > > > Removed_Space =3D TargetFv.Data.Free_Space - > New_Free_Space > > > > TargetFv.Child[-1].Data.Data =3D b'\xff' * > New_Free_Space > > > > TargetFv.Data.Size -=3D Removed_Space > > > > - TargetFv.Data.Header.Fvlength =3D TargetFv.Data.Size > > > > - ModifyFvSystemGuid(TargetFv) > > > > + TargetFv.Data.Header.FvLength =3D TargetFv.Data.Size > > > > + if struct2stream(TargetFv.Data.Header.FileSystemGuid) > > > > + =3D=3D > > > > EFI_FIRMWARE_FILE_SYSTEM3_GUID_BYTE: > > > > + if TargetFv.Data.Size <=3D 0xFFFFFF: > > > > + TargetFv.Data.Header.FileSystemGuid =3D > > > > ModifyGuidFormat( > > > > + > "8c8ce578-8a3d-4f1c-9935-896185c32dd3") > > > > + > > > > for item in TargetFv.Child: > > > > if item.type =3D=3D FFS_FREE_SPACE: > > > > TargetFv.Data.Data +=3D item.Data.Data + > > > > item.Data.PadData > > > > -- > > > > 2.27.0.windows.1 > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >=20 >=20 >=20 >=20 >=20 -=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 (#111846): https://edk2.groups.io/g/devel/message/111846 Mute This Topic: https://groups.io/mt/102874227/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-