Skip to content

Commit b31ba3a

Browse files
committed
Merge bitcoin/bitcoin#24948: contrib: macdeploy: fix typo in permissions
51d06df contrib: macdeploy: fix permissions typo in gen-sdk script (Pavol Rusnak) Pull request description: Fixes bitcoin/bitcoin#24947 ACKs for top commit: laanwj: Edit: tested ACK 51d06df hebasto: ACK 51d06df fanquake: ACK 51d06df - recreated the tarball, but didn't run a Guix build. Tree-SHA512: c8af0690e6059b4f4f15b5b541be27cb7d92d4cedc744320a46b4df8af1fc017d124f0e8067f75cf89aa3d0662777d66e5ce7e0e9c371df6fda377d60ee5f679
2 parents b1c5991 + 51d06df commit b31ba3a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

contrib/macdeploy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ previous stage) as the first argument.
5858
./contrib/macdeploy/gen-sdk '/path/to/Xcode.app'
5959
```
6060

61-
The `sha256sum` of the generated TAR.GZ archive should be `e7ca56bc8804d16624fad68be2e71647747d6629cacaaa3de5fbfa7f444e9eae`.
61+
The `sha256sum` of the generated TAR.GZ archive should be `df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619`.
6262

6363
## Deterministic macOS DMG Notes
6464

contrib/macdeploy/gen-sdk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def run():
9595
tarinfo.uid, tarinfo.uname = 0, ''
9696
tarinfo.gid, tarinfo.gname = 0, ''
9797
# don't use isdir() as there are also executable files present
98-
tarinfo.mode = 0o0755 if tarinfo.mode & 0o0100 else 0x0644
98+
tarinfo.mode = 0o0755 if tarinfo.mode & 0o0100 else 0o0644
9999
return tarinfo
100100
with cd(dir_to_add):
101101
# recursion already adds entries in sorted order

0 commit comments

Comments
 (0)