Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv issue
Thanks a lot~ > -Original Message- > From: gaoliming > Sent: Monday, December 11, 2023 5:04 PM > To: Chen, Christine ; devel@edk2.groups.io; Feng, > Bob C > Cc: 'Rebecca Cran' ; Guo, Gua > Subject: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv > issue > > Christine: > I add PUSH label for this PR. > > Thanks > Liming > > -邮件原件- > > 发件人: Chen, Christine > > 发送时间: 2023年12月4日 10:59 > > 收件人: Gao, Liming ; devel@edk2.groups.io; > > Feng, Bob C > > 抄送: 'Rebecca Cran' ; Guo, Gua > > > 主题: RE: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv > > issue > > > > 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 > > > > Thanks, > > Christine > > > > > -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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT > > ShrinkFv > > > issue > > > > > > Yuwei: > > > Please update commit message with reviewed-by info, then I will > > > add > > push > > > label for this patch set. > > > > > > Thanks > > > Liming > > > > -邮件原件- > > > > 发件人: devel@edk2.groups.io 代表 Yuwei > > Chen > > > > 发送时间: 2023年11月29日 16:26 > > > > 收件人: Gao, Liming ; Feng, Bob C > > > > > > > > 抄送: 'Rebecca Cran' ; devel@edk2.groups.io; > > Chen, > > > > Christine ; Guo, Gua > > > > 主题: 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~ 😊 > > > > > > > > > > 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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing > > > > > > FMMT ShrinkFv issue > > > > > > > > > > > > Christine: > > > > > > I have no comments for this patch set. Reviewed-by: Liming > > > > > > Gao > > > > > > > > > > > > Thanks > > > > > > Liming > > > > > > > -邮件原件- > > > > > > > 发件人: devel@edk2.groups.io 代表 Bob > > > > Feng > > > > > > > 发送时间: 2023年6月29日 14:54 > > > > > > > 收件人: Chen, Christine ; > > > > devel@edk2.groups.io > > > > > > > 抄送: Rebecca Cran ; Gao, Liming > > > > > > > > > > > > > > 主题: 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@edk
Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv issue
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 Thanks, Christine > -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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv > issue > > Yuwei: > Please update commit message with reviewed-by info, then I will add push > label for this patch set. > > Thanks > Liming > > -邮件原件- > > 发件人: devel@edk2.groups.io 代表 Yuwei Chen > > 发送时间: 2023年11月29日 16:26 > > 收件人: Gao, Liming ; Feng, Bob C > > > > 抄送: 'Rebecca Cran' ; devel@edk2.groups.io; Chen, > > Christine ; Guo, Gua > > 主题: 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~ 😊 > > > > > > 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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT > > > > ShrinkFv issue > > > > > > > > Christine: > > > > I have no comments for this patch set. Reviewed-by: Liming Gao > > > > > > > > > > > > Thanks > > > > Liming > > > > > -邮件原件- > > > > > 发件人: devel@edk2.groups.io 代表 Bob > > Feng > > > > > 发送时间: 2023年6月29日 14:54 > > > > > 收件人: Chen, Christine ; > > devel@edk2.groups.io > > > > > 抄送: Rebecca Cran ; Gao, Liming > > > > > > > > > > 主题: 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=None > > > > > > > > > > > > FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findli > > > > > st > > > > > [i > > > > > ndex]) > > > > >
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~ 😊 > > 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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT > > ShrinkFv issue > > > > Christine: > > I have no comments for this patch set. Reviewed-by: Liming Gao > > > > > > Thanks > > Liming > > > -邮件原件- > > > 发件人: devel@edk2.groups.io 代表 Bob Feng > > > 发送时间: 2023年6月29日 14:54 > > > 收件人: Chen, Christine ; devel@edk2.groups.io > > > 抄送: Rebecca Cran ; Gao, Liming > > > > > > 主题: 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=None > > > > > > FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findli > > > st > > > [i > > > ndex]) > > > if FmmtParser.WholeFvTree.Findlist != []: > > > TargetNode = FmmtParser.WholeFvTree.Findlist[0] > > > -if TargetNode.type == FV_TREE or SEC_FV_TREE or > > > DATA_FV_TREE: > > > +if TargetNode.type == FV_TREE or TargetNode.type == > > > SEC_FV_TREE or TargetNode.type == DATA_FV_TREE: > > > FinalData = 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 = 0 > > > ParTree.Data.Size += Needed_Space > > > -ParTree.Data.Header.Fvlength = > > > ParTree.Data.Size > > > +ParTree.Data.Header.FvLength = > > > ParTree.Data.Size > > > ModifyFvSystemGuid(ParTree) > > > for item in ParTree.Child: > > > if item.type == FFS_FREE_SPACE: > > > @@ -650,8 +650,12 @@ class FvHandler: > > > Removed_Space = TargetFv.Data.Free_Space - New_Free_Space > > > TargetFv.Child[-1].Data.Data = b'\xff' * New_Free_Space > > > TargetFv.Data.Size -= Removed_Space > > > -TargetFv.Data.Header.Fvlength = Targ
Re: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv issue
Thanks liming~ Hope it will be merged soon~ 😊 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: 回复: [edk2-devel] [Patch V2 1/4] BaseTools: fixing FMMT ShrinkFv > issue > > Christine: > I have no comments for this patch set. Reviewed-by: Liming Gao > > > Thanks > Liming > > -邮件原件- > > 发件人: devel@edk2.groups.io 代表 Bob Feng > > 发送时间: 2023年6月29日 14:54 > > 收件人: Chen, Christine ; devel@edk2.groups.io > > 抄送: Rebecca Cran ; Gao, Liming > > > > 主题: 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=None > > > > FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findlist > > [i > > ndex]) > > if FmmtParser.WholeFvTree.Findlist != []: > > TargetNode = FmmtParser.WholeFvTree.Findlist[0] > > -if TargetNode.type == FV_TREE or SEC_FV_TREE or > > DATA_FV_TREE: > > +if TargetNode.type == FV_TREE or TargetNode.type == > > SEC_FV_TREE or TargetNode.type == DATA_FV_TREE: > > FinalData = 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 = 0 > > ParTree.Data.Size += Needed_Space > > -ParTree.Data.Header.Fvlength = > > ParTree.Data.Size > > +ParTree.Data.Header.FvLength = > > ParTree.Data.Size > > ModifyFvSystemGuid(ParTree) > > for item in ParTree.Child: > > if item.type == FFS_FREE_SPACE: > > @@ -650,8 +650,12 @@ class FvHandler: > > Removed_Space = TargetFv.Data.Free_Space - New_Free_Space > > TargetFv.Child[-1].Data.Data = b'\xff' * New_Free_Space > > TargetFv.Data.Size -= Removed_Space > > -TargetFv.Data.Header.Fvlength = TargetFv.Data.Size > > -ModifyFvSystemGuid(TargetFv) > > +TargetFv.Data.Header.FvLength = TargetFv.Data.Size > > +if struct2stream(TargetFv.Data.Header.FileSystemGuid) == > > EFI_FIRMWARE_FILE_SYSTEM3_GUID_BYTE: > > +if TargetFv.Data.Size <= 0xFF: > > +TargetFv.Data.Header.FileSystemGuid = > > ModifyGuidFormat( > > +"8c8ce578-8a3d-4f1c-9935-896185c32dd3") > > + > > for item in TargetFv.Child: > > if item.type == FFS_FREE_SPACE: > > TargetFv.Data.Data += item.Data.Data + > > item.Data.PadData > > -- > > 2.27.0.windows.1 > > > > > > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108471): https://edk2.groups.io/g/devel/message/108471 Mute This Topic: https://groups.io/mt/101284551/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
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=None FmmtParser.WholeFvTree.Findlist.remove(FmmtParser.WholeFvTree.Findlist[index]) if FmmtParser.WholeFvTree.Findlist != []: TargetNode = FmmtParser.WholeFvTree.Findlist[0] -if TargetNode.type == FV_TREE or SEC_FV_TREE or DATA_FV_TREE: +if TargetNode.type == FV_TREE or TargetNode.type == SEC_FV_TREE or TargetNode.type == DATA_FV_TREE: FinalData = 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 = 0 ParTree.Data.Size += Needed_Space -ParTree.Data.Header.Fvlength = ParTree.Data.Size +ParTree.Data.Header.FvLength = ParTree.Data.Size ModifyFvSystemGuid(ParTree) for item in ParTree.Child: if item.type == FFS_FREE_SPACE: @@ -650,8 +650,12 @@ class FvHandler: Removed_Space = TargetFv.Data.Free_Space - New_Free_Space TargetFv.Child[-1].Data.Data = b'\xff' * New_Free_Space TargetFv.Data.Size -= Removed_Space -TargetFv.Data.Header.Fvlength = TargetFv.Data.Size -ModifyFvSystemGuid(TargetFv) +TargetFv.Data.Header.FvLength = TargetFv.Data.Size +if struct2stream(TargetFv.Data.Header.FileSystemGuid) == EFI_FIRMWARE_FILE_SYSTEM3_GUID_BYTE: +if TargetFv.Data.Size <= 0xFF: +TargetFv.Data.Header.FileSystemGuid = ModifyGuidFormat( +"8c8ce578-8a3d-4f1c-9935-896185c32dd3") + for item in TargetFv.Child: if item.type == FFS_FREE_SPACE: TargetFv.Data.Data += item.Data.Data + item.Data.PadData -- 2.27.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#106497): https://edk2.groups.io/g/devel/message/106497 Mute This Topic: https://groups.io/mt/99845056/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
