From nobody Tue May 21 00:11:01 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+106433+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106433+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1687887618; cv=none; d=zohomail.com; s=zohoarc; b=CIvR/N5bWDDC9zOyfwotCL0gEX5EBiBR3kvHzOkYHrHJAZSl8XLHPmlUAUyD2DfXsadaJ7wZVtAQjn1z0u9q2IPGYWrsgOyEsTx2lunkC7MPJ8l70IYRB+WnTEkYOQb3unTDEPfKu8WBXEaNRbi3XUbyAl8OxOWaL41/zWcZZ8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1687887618; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=eV6b9oCMAkkpT/sIgBw3YQYyMQB2BHKmnKpFQ6keBiw=; b=mSMftIrC0tewHFVlKDD8jrY4YgRc0ei+I1UWQHBmQSqauvNfExoAgFHNpifg6YimHrnp/K0/gDpUAwe6/8nHeIIoLzC3QBSTN6k/VxgTfOkx7gGCiEBcrEOtcVinq0+B4gYhVCXPjqDd/L0Ji47LhKvXixYK8R5nAVpo/o1epzg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+106433+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1687887618986494.37282880196994; Tue, 27 Jun 2023 10:40:18 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id GFA9YY1788612xy1WGRCxN94; Tue, 27 Jun 2023 10:40:18 -0700 X-Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.2933.1687883257970851343 for ; Tue, 27 Jun 2023 09:27:38 -0700 X-Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1b80bce2592so13198495ad.2 for ; Tue, 27 Jun 2023 09:27:37 -0700 (PDT) X-Gm-Message-State: sFNfBYemccp1V9afmEjtfQy6x1787277AA= X-Google-Smtp-Source: ACHHUZ4uiMsqnu36rE+jtAE3hX+YRux1Hhn5xP/kw+ImaGWM2msfXsWfNHa5mVdVhgBzKLgY4sSLIw== X-Received: by 2002:a17:903:18b:b0:1b5:2c0b:22d3 with SMTP id z11-20020a170903018b00b001b52c0b22d3mr9530583plg.14.1687883257153; Tue, 27 Jun 2023 09:27:37 -0700 (PDT) X-Received: from localhost.localdomain ([2001:4898:80e8:36:e1a8:b1a0:47f3:b1d5]) by smtp.gmail.com with ESMTPSA id k9-20020a170902760900b001b54a88e6adsm6063992pll.309.2023.06.27.09.27.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 09:27:36 -0700 (PDT) From: Joey Vagedes To: devel@edk2.groups.io Cc: Rebecca Cran , Liming Gao , Bob Feng , Yuwei Chen , Michael D Kinney Subject: [edk2-devel] [PATCH v1 1/1] BaseTools: BinToPcd: Resolve xdrlib deprecation Date: Tue, 27 Jun 2023 09:27:22 -0700 Message-ID: <20230627162722.1030-2-joey.vagedes@gmail.com> In-Reply-To: <20230627162722.1030-1-joey.vagedes@gmail.com> References: <20230627162722.1030-1-joey.vagedes@gmail.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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,joey.vagedes@gmail.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1687887618; bh=kenueE6Vn67sqgGnJA4d6sfvvNvz3DqhltvAdhiymPc=; h=Cc:Date:From:Reply-To:Subject:To; b=iAdj3DsYvNJJJqSiIF5nAO4YqBvLdfmqSO8YScRpeKkqQe31UyALvtj6Zgkho1Vhh1H y+DB9edkJyedjqu9+/tfo8ejtmNvnixEAx2i+UlrdRj5LNUIldGp58CCoRzv8ZO6cNBf6 DNPMTbFsej5tiOqa+gIr/NmEmlb2HFiJvNs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1687887619218100003 Content-Type: text/plain; charset="utf-8" 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 Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Cc: Michael D Kinney Signed-off-by: Joey Vagedes Reviewed-by: Liming Gao Reviewed-by: Liming Gao I will merge it today.=20 Reviewed-by: Michael D Kinney > Reviewed-by: Michael D Kinney --- 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 =20 # # Globals for help information @@ -46,16 +49,24 @@ if __name__ =3D=3D '__main__': raise argparse.ArgumentTypeError (Message) return Argument =20 + def XdrPackBuffer (buffer): + packed_bytes =3D io.BytesIO() + for unpacked_bytes in buffer: + n =3D len(unpacked_bytes) + packed_bytes.write(struct.pack('>L',n)) + data =3D unpacked_bytes[:n] + n =3D math.ceil(n/4)*4 + data =3D data + (n - len(data)) * b'\0' + packed_bytes.write(data) + return packed_bytes.getvalue() + def ByteArray (Buffer, Xdr =3D False): if Xdr: # # If Xdr flag is set then encode data using the Variable-Lengt= h Opaque # Data format of RFC 4506 External Data Representation Standar= d (XDR). # - XdrEncoder =3D xdrlib.Packer () - for Item in Buffer: - XdrEncoder.pack_bytes (Item) - Buffer =3D bytearray (XdrEncoder.get_buffer ()) + Buffer =3D bytearray (XdrPackBuffer (Buffer)) else: # # If Xdr flag is not set, then concatenate all the data --=20 2.41.0.windows.1 -=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 (#106433): https://edk2.groups.io/g/devel/message/106433 Mute This Topic: https://groups.io/mt/99814223/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-