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 3530AAC0D94 for ; Mon, 11 Dec 2023 09:04:30 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Dx3B4yvFRxth19fsjcMSejCYsTMQbZJOhZxSmdBY6f8=; 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=1702285468; v=1; b=EVLg7uuHPCq0qwdY4vkZb9FNs9Avcsody4v1uvv28kq/ShC/4O27z62UC526ZGAOJE8LItEp LuhpvNgw5pdAO1dgq5Y5yyvPl0hzzvFMy3wKV/eyMVvOtPBn7YEwWmPV7MEEYDqOXyurdyTNI+G 0OmH29wtygMpcYw/R75yJu/I= X-Received: by 127.0.0.2 with SMTP id tvLUYY7687511xa5hlGVhkso; Mon, 11 Dec 2023 01:04:28 -0800 X-Received: from cxsh.intel-email.com (cxsh.intel-email.com [121.46.250.151]) by mx.groups.io with SMTP id smtpd.web10.4330.1702285466392599825 for ; Mon, 11 Dec 2023 01:04:27 -0800 X-Received: from cxsh.intel-email.com (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id 03D04DDA795 for ; Mon, 11 Dec 2023 17:04:24 +0800 (CST) X-Received: from localhost (localhost [127.0.0.1]) by cxsh.intel-email.com (Postfix) with ESMTP id F32B1DDA790 for ; Mon, 11 Dec 2023 17:04:23 +0800 (CST) X-Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by cxsh.intel-email.com (Postfix) with SMTP id 3A9C8DDA7BD for ; Mon, 11 Dec 2023 17:04:20 +0800 (CST) X-Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP(SSL) for ; Mon, 11 Dec 2023 17:04:12 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming via groups.io" To: "'Chen, Christine'" , , "'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> <046b01da22dc$2221f050$6665d0f0$@byosoft.com.cn> In-Reply-To: Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0gW1BhdGNoIFYyIDEvNF0gQmFzZVRvb2xzOiBmaXhpbmcgRk1NVCBTaHJpbmtGdiBpc3N1ZQ==?= Date: Mon, 11 Dec 2023 17:04:12 +0800 Message-ID: <06ca01da2c11$022ada80$06808f80$@byosoft.com.cn> MIME-Version: 1.0 Thread-Index: AQJ/u0azJS3m3Dm2ofnHecjJWqzL7gEejPMNAn/VDLQCyXChhAFpoIinAaoQMMgB+bWdjq79AZIg 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: BdHuVK4JNB4MN9PUhePEj6oox7686176AA= 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=EVLg7uuH; 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 Christine: I add PUSH label for this PR. Thanks Liming > -----=E9=82=AE=E4=BB=B6=E5=8E=9F=E4=BB=B6----- > =E5=8F=91=E4=BB=B6=E4=BA=BA: Chen, Christine > =E5=8F=91=E9=80=81=E6=97=B6=E9=97=B4: 2023=E5=B9=B412=E6=9C=884=E6=97=A5 = 10:59 > =E6=94=B6=E4=BB=B6=E4=BA=BA: Gao, Liming ; deve= l@edk2.groups.io; > Feng, Bob C > =E6=8A=84=E9=80=81: 'Rebecca Cran' ; Guo, Gua > =E4=B8=BB=E9=A2=98: RE: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMM= T ShrinkFv issue >=20 > Hi Liming, > To avoid wrong operation. I create a new PR for this patch series with > Reviewed-by. > Please help adding push label. Thanks. > https://github.com/tianocore/edk2/pull/5102 >=20 > Thanks, > Christine >=20 > > -----Original Message----- > > From: gaoliming > > Sent: Wednesday, November 29, 2023 11:53 PM > > To: devel@edk2.groups.io; Chen, Christine ; Feng, > > Bob C > > Cc: 'Rebecca Cran' ; Guo, Gua > > Subject: =E5=9B=9E=E5=A4=8D: [edk2-devel] [Patch V2 1/4] BaseTools: fix= ing FMMT > ShrinkFv > > issue > > > > Yuwei: > > Please update commit message with reviewed-by info, then I will add > push > > label for this patch set. > > > > 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.gr= oups.io; > Chen, > > > Christine ; Guo, Gua > > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing= FMMT ShrinkFv > > > issue > > > > > > Hi Liming and Cran, > > > > > > 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~ > > > > > > Thanks, > > > Yuwei (Christine) > > > > > > > -----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 > > > > ShrinkFv 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] BaseTool= s: fixing 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, Limi= ng > > > > > > > > > > > > =E4=B8=BB=E9=A2=98: Re: [edk2-devel] [Patch V2 1/4] BaseTools: = fixing 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.Si= ze > > > > > > - ModifyFvSystemGuid(TargetFv) > > > > > > + TargetFv.Data.Header.FvLength =3D TargetFv.Data.Si= ze > > > > > > + 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 > > > > > > > -=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 (#112274): https://edk2.groups.io/g/devel/message/112274 Mute This Topic: https://groups.io/mt/103105535/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-