From 23f05cdf51a0740972ad1790c9c1a3527244399e Mon Sep 17 00:00:00 2001 From: scgbckbone Date: Sat, 7 Jun 2025 09:42:58 +0200 Subject: [PATCH] remove linux address patch --- README.md | 4 +++- unix/linux_addr.patch | 16 ---------------- unix/variant/pyb.py | 6 +----- 3 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 unix/linux_addr.patch diff --git a/README.md b/README.md index 54af306ff..e0cbbb7d4 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,9 @@ git clone --recursive https://github.com/Coldcard/firmware.git cd firmware # Apply address patch -git apply unix/linux_addr.patch +# if unix/linux_addr.patch exists use below command +# not needed in current revision +# git apply unix/linux_addr.patch # * below is needed for ubuntu 24.04 pushd external/micropython diff --git a/unix/linux_addr.patch b/unix/linux_addr.patch deleted file mode 100644 index d3223388e..000000000 --- a/unix/linux_addr.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/unix/variant/pyb.py b/unix/variant/pyb.py -index 5e108da3..5a15fc9c 100644 ---- a/unix/variant/pyb.py -+++ b/unix/variant/pyb.py -@@ -40,9 +40,9 @@ class USB_HID: - sfp_b = SOCKET_FILE_PATH.encode() - self.pipe = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # If on linux, try commenting the following line -- addr = bytes([len(sfp_b)+2, socket.AF_UNIX] + list(sfp_b)) -+ #addr = bytes([len(sfp_b)+2, socket.AF_UNIX] + list(sfp_b)) - # If on linux, try uncommenting the following two lines -- # addr = struct.pack('H108s', socket.AF_UNIX, sfp_b) -+ addr = struct.pack('H108s', socket.AF_UNIX, sfp_b) - while 1: - try: - self.pipe.bind(addr) diff --git a/unix/variant/pyb.py b/unix/variant/pyb.py index 5e108da38..b0b6b2867 100644 --- a/unix/variant/pyb.py +++ b/unix/variant/pyb.py @@ -37,12 +37,8 @@ def __init__(self): def _open(self): assert SOCKET_FILE_PATH # has to be set in sim_boot.py by caller - sfp_b = SOCKET_FILE_PATH.encode() self.pipe = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM) - # If on linux, try commenting the following line - addr = bytes([len(sfp_b)+2, socket.AF_UNIX] + list(sfp_b)) - # If on linux, try uncommenting the following two lines - # addr = struct.pack('H108s', socket.AF_UNIX, sfp_b) + addr = struct.pack('H108s', socket.AF_UNIX, SOCKET_FILE_PATH.encode()) while 1: try: self.pipe.bind(addr)