<div dir="ltr">Thank you for the review Michael. <a class="gmail_plusreply" id="plusReplyChip-0" href="mailto:rebecca@bsdio.com" tabindex="-1">@Rebecca Cran</a>, <a class="gmail_plusreply" id="plusReplyChip-1" href="mailto:gaoliming@byosoft.com.cn" tabindex="-1">@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.<div> </div><div>Thanks,</div><div>Joey</div></div> <div class="gmail_quote"><div dir="ltr" class="gmail_attr">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: </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">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 </blockquote></div> <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/106911">View/Reply Online (#106911)</a> | | <a target="_blank" href="https://groups.io/mt/99813913/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>