<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"><head><meta http-equiv=Content-Type content="text/html; charset=utf-8"><meta name=Generator content="Microsoft Word 15 (filtered medium)"><style></style></head><body lang=ZH-CN link=blue vlink=purple style='word-wrap:break-word'><div class=WordSection1>Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn><o:p></o:p><o:p> </o:p><div style='border:none;border-left:solid blue 1.5pt;padding:0cm 0cm 0cm 4.0pt'><div><div style='border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0cm 0cm 0cm'>发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Joey Vagedes via groups.io 发送时间: 2023年7月13日 23:27 收件人: Kinney, Michael D <michael.d.kinney@intel.com> 抄送: devel@edk2.groups.io; Rebecca Cran <rebecca@bsdio.com>; Gao, Liming <gaoliming@byosoft.com.cn>; Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine <yuwei.chen@intel.com> 主题: Re: [edk2-devel] [PATCH v1 1/1] BaseTools: BinToPcd: Resolve xdrlib deprecation<o:p></o:p></div></div><o:p> </o:p><div>Thank you for the review Michael. <a href="mailto:rebecca@bsdio.com">@Rebecca Cran</a>, <a href="mailto:gaoliming@byosoft.com.cn">@Liming Gao</a> have you had time to take a look at this? It is a fairly simple change, following the same logic as xdrlib with a few modifications to use some newer python functionality.<o:p></o:p><div><o:p> </o:p></div><div>Thanks,<o:p></o:p></div><div>Joey<o:p></o:p></div></div><o:p> </o:p><div><div>On Tue, Jun 27, 2023 at 10:21 AM Kinney, Michael D <<a href="mailto:michael.d.kinney@intel.com">michael.d.kinney@intel.com</a>> wrote:<o:p></o:p></div><blockquote style='border:none;border-left:solid #CCCCCC 1.0pt;padding:0cm 0cm 0cm 6.0pt;margin-left:4.8pt;margin-right:0cm'>Thank you for fixing this. Reviewed-by: Michael D Kinney <<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>> > -----Original Message----- > From: Joey Vagedes <<a href="mailto:joey.vagedes@gmail.com" target="_blank">joey.vagedes@gmail.com</a>> > Sent: Tuesday, June 27, 2023 9:27 AM > To: <a href="mailto:devel@edk2.groups.io" target="_blank">devel@edk2.groups.io</a> > Cc: Rebecca Cran <<a href="mailto:rebecca@bsdio.com" target="_blank">rebecca@bsdio.com</a>>; Gao, Liming > <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank">gaoliming@byosoft.com.cn</a>>; Feng, Bob C <<a href="mailto:bob.c.feng@intel.com" target="_blank">bob.c.feng@intel.com</a>>; Chen, > Christine <<a href="mailto:yuwei.chen@intel.com" target="_blank">yuwei.chen@intel.com</a>>; Kinney, Michael D > <<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>> > Subject: [PATCH v1 1/1] BaseTools: BinToPcd: Resolve xdrlib deprecation > > Removes the dependency on xdrlib and replaces it with custom logic to > pack a per the xdr requirements. Necessary as xdrlib is being deprecated > in python 3.13. > > Cc: Rebecca Cran <<a href="mailto:rebecca@bsdio.com" target="_blank">rebecca@bsdio.com</a>> > Cc: Liming Gao <<a href="mailto:gaoliming@byosoft.com.cn" target="_blank">gaoliming@byosoft.com.cn</a>> > Cc: Bob Feng <<a href="mailto:bob.c.feng@intel.com" target="_blank">bob.c.feng@intel.com</a>> > Cc: Yuwei Chen <<a href="mailto:yuwei.chen@intel.com" target="_blank">yuwei.chen@intel.com</a>> > Cc: Michael D Kinney <<a href="mailto:michael.d.kinney@intel.com" target="_blank">michael.d.kinney@intel.com</a>> > Signed-off-by: Joey Vagedes <<a href="mailto:joeyvagedes@gmail.com" target="_blank">joeyvagedes@gmail.com</a>> > --- > BaseTools/Scripts/BinToPcd.py | 19 +++++++++++++++---- > 1 file changed, 15 insertions(+), 4 deletions(-) > > diff --git a/BaseTools/Scripts/BinToPcd.py b/BaseTools/Scripts/BinToPcd.py > index 3bc557b8412c..460c08b7f7cd 100644 > --- a/BaseTools/Scripts/BinToPcd.py > +++ b/BaseTools/Scripts/BinToPcd.py > @@ -14,6 +14,9 @@ import sys > import argparse > > import re > > import xdrlib > > +import io > > +import struct > > +import math > > > > # > > # Globals for help information > > @@ -46,16 +49,24 @@ if __name__ == '__main__': > raise argparse.ArgumentTypeError (Message) > > return Argument > > > > + def XdrPackBuffer (buffer): > > + packed_bytes = io.BytesIO() > > + for unpacked_bytes in buffer: > > + n = len(unpacked_bytes) > > + packed_bytes.write(struct.pack('>L',n)) > > + data = unpacked_bytes[:n] > > + n = math.ceil(n/4)*4 > > + data = data + (n - len(data)) * b'\0' > > + packed_bytes.write(data) > > + return packed_bytes.getvalue() > > + > > def ByteArray (Buffer, Xdr = False): > > if Xdr: > > # > > # If Xdr flag is set then encode data using the Variable- > Length Opaque > > # Data format of RFC 4506 External Data Representation > Standard (XDR). > > # > > - XdrEncoder = xdrlib.Packer () > > - for Item in Buffer: > > - XdrEncoder.pack_bytes (Item) > > - Buffer = bytearray (XdrEncoder.get_buffer ()) > > + Buffer = bytearray (XdrPackBuffer (Buffer)) > > else: > > # > > # If Xdr flag is not set, then concatenate all the data > > -- > 2.41.0.windows.1<o:p></o:p></blockquote></div><div></o:p></div></div></div></body></html> <div width="1" style="color:white;clear:both">_._,_._,_</div> <hr> Groups.io Links: You receive all messages sent to this group. <a target="_blank" href="https://edk2.groups.io/g/devel/message/106951">View/Reply Online (#106951)</a> | | <a target="_blank" href="https://groups.io/mt/100187059/1813853">Mute This Topic</a> | <a href="https://edk2.groups.io/g/devel/post">New Topic</a> <a href="https://edk2.groups.io/g/devel/editsub/1813853">Your Subscription</a> | <a href="mailto:devel+owner@edk2.groups.io">Contact Group Owner</a> | <a href="https://edk2.groups.io/g/devel/unsub">Unsubscribe</a> [edk2-devel-archive@redhat.com] <div width="1" style="color:white;clear:both">_._,_._,_</div>