Skip to content

remove linux address patch #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
doc-hex merged 1 commit into from
Jun 11, 2025
Merged

remove linux address patch #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 0 additions & 16 deletions unix/linux_addr.patch
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions unix/variant/pyb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down