diff options
| author | fanquake <fanquake@gmail.com> | 2022-04-25 09:44:59 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-04-25 09:45:16 +0100 |
| commit | b31ba3abf81c0770fd12ae59e25ba1e92ef45f05 (patch) | |
| tree | 33f526b3a4d871aa27b90fa0b38692773fcedff3 | |
| parent | b1c5991eebb916755be188f355ad36fe01a3f529 (diff) | |
| parent | 51d06df8746828ffac39ac94f9efa3332b3f0556 (diff) | |
Merge bitcoin/bitcoin#24948: contrib: macdeploy: fix typo in permissions
51d06df8746828ffac39ac94f9efa3332b3f0556 contrib: macdeploy: fix permissions typo in gen-sdk script (Pavol Rusnak)
Pull request description:
Fixes https://github.com/bitcoin/bitcoin/issues/24947
ACKs for top commit:
laanwj:
Edit: tested ACK 51d06df8746828ffac39ac94f9efa3332b3f0556
hebasto:
ACK 51d06df8746828ffac39ac94f9efa3332b3f0556
fanquake:
ACK 51d06df8746828ffac39ac94f9efa3332b3f0556 - recreated the tarball, but didn't run a Guix build.
Tree-SHA512: c8af0690e6059b4f4f15b5b541be27cb7d92d4cedc744320a46b4df8af1fc017d124f0e8067f75cf89aa3d0662777d66e5ce7e0e9c371df6fda377d60ee5f679
| -rw-r--r-- | contrib/macdeploy/README.md | 2 | ||||
| -rwxr-xr-x | contrib/macdeploy/gen-sdk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/macdeploy/README.md b/contrib/macdeploy/README.md index fa7d953ce3..64e36f22b9 100644 --- a/contrib/macdeploy/README.md +++ b/contrib/macdeploy/README.md @@ -58,7 +58,7 @@ previous stage) as the first argument. ./contrib/macdeploy/gen-sdk '/path/to/Xcode.app' ``` -The `sha256sum` of the generated TAR.GZ archive should be `e7ca56bc8804d16624fad68be2e71647747d6629cacaaa3de5fbfa7f444e9eae`. +The `sha256sum` of the generated TAR.GZ archive should be `df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619`. ## Deterministic macOS DMG Notes diff --git a/contrib/macdeploy/gen-sdk b/contrib/macdeploy/gen-sdk index d70cc8613c..6efaaccb8e 100755 --- a/contrib/macdeploy/gen-sdk +++ b/contrib/macdeploy/gen-sdk @@ -95,7 +95,7 @@ def run(): tarinfo.uid, tarinfo.uname = 0, '' tarinfo.gid, tarinfo.gname = 0, '' # don't use isdir() as there are also executable files present - tarinfo.mode = 0o0755 if tarinfo.mode & 0o0100 else 0x0644 + tarinfo.mode = 0o0755 if tarinfo.mode & 0o0100 else 0o0644 return tarinfo with cd(dir_to_add): # recursion already adds entries in sorted order |