contrib: macdeploy: fix typo in permissions #24948

pull prusnak wants to merge 1 commits into bitcoin:master from prusnak:fix-gen-sdk changing 2 files +2 −2

prusnak commented at 8:02 PM on April 22, 2022: contributor

Fixes https://github.com/bitcoin/bitcoin/issues/24947
prusnak marked this as a draft on Apr 22, 2022
contrib: macdeploy: fix permissions typo in gen-sdk script 51d06df874
prusnak force-pushed on Apr 22, 2022
prusnak marked this as ready for review on Apr 22, 2022
laanwj commented at 8:29 PM on April 22, 2022: member
Code review ACK, looks like it fixes the problem on first glance! (but let's learn from our last mistake and actually test it in a guix build before ACKing :blush: )

sha256sum:
```
df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619  Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
```
Edit: tested ACK 51d06df8746828ffac39ac94f9efa3332b3f0556
- I generated the .tar.gz from the extracted SDK using the script in this PR, I verified that the permissions look sane
- I have built the 23.0 release from scratch, successfully, using that generated .tar.gz, and got the same output as the other builders
DrahtBot added the label Scripts and tools on Apr 22, 2022
fanquake deleted a comment on Apr 23, 2022

hebasto commented at 8:17 AM on April 24, 2022: member

On Ubuntu 22.04, x86_64:

$ ./contrib/macdeploy/gen-sdk ../XIP/Xcode.app
Found Xcode (version: 12.2, build id: 12B45b)
Found MacOSX SDK (version: 11.0, build id: 20A2408)
Creating output .tar.gz file...
Adding MacOSX SDK 11.0 files...
Adding libc++ headers...
Done! Find the resulting gzipped tarball at:
/home/hebasto/GitHub/bitcoin/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
hebasto@latitude-5490:~/GitHub/bitcoin$ sha256sum Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz 
df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619  Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz

On macOS Monterey 12.3.1 (21E258, Apple M1):

% ./contrib/macdeploy/gen-sdk ../SDKs/Xcode.app 
Found Xcode (version: 12.2, build id: 12B45b)
Found MacOSX SDK (version: 11.0, build id: 20A2408)
Creating output .tar.gz file...
Adding MacOSX SDK 11.0 files...
Adding libc++ headers...
Done! Find the resulting gzipped tarball at:
/Users/hebasto/bitcoin/Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
% shasum -a 256 Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz 
df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619  Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz

Guix builds for v23.0 release:

$ find guix-build-23.0/output/ -type f -print0 | env LC_ALL=C sort -z | xargs -r0 sha256sum
702a239dc8819a29e8eb54efc0ece386f3889e73b4c6a77473c4fc906d48d8ba  guix-build-23.0/output/arm64-apple-darwin/SHA256SUMS.part
c991de5922cb2880f0f54a7f21ba650da40872b4a6dad73fae09d7a89d8c8f28  guix-build-23.0/output/arm64-apple-darwin/bitcoin-23.0-arm64-apple-darwin-unsigned.dmg
cdb380556e9858b22d9e9bfe3c2200f2d7efdc12af505390ca7798d97f6cd57c  guix-build-23.0/output/arm64-apple-darwin/bitcoin-23.0-arm64-apple-darwin-unsigned.tar.gz
7c8bc63731aa872b7b334a8a7d96e33536ad77d49029bad179b09dca32cd77ac  guix-build-23.0/output/arm64-apple-darwin/bitcoin-23.0-arm64-apple-darwin.tar.gz
26748bf49d6d6b4014d0fedccac46bf2bcca42e9d34b3acfd9e3467c415acc05  guix-build-23.0/output/dist-archive/bitcoin-23.0.tar.gz
b50af40fde0d18c5d82974b2da83e7b7dac45de9067c9989fde38663ffbfe291  guix-build-23.0/output/x86_64-apple-darwin/SHA256SUMS.part
050eb122ef226ab9cfd6fe19a71c0a49029b9eac13faf033dbb60cdfa3a55c65  guix-build-23.0/output/x86_64-apple-darwin/bitcoin-23.0-x86_64-apple-darwin-unsigned.dmg
ac43412ba3fea4436a90ada71decb25ee122b60396ce6a67f933424dc3dceb17  guix-build-23.0/output/x86_64-apple-darwin/bitcoin-23.0-x86_64-apple-darwin-unsigned.tar.gz
c816780583009a9dad426dc0c183c89be9da98906e1e2c7ebae91041c1aaaaf3  guix-build-23.0/output/x86_64-apple-darwin/bitcoin-23.0-x86_64-apple-darwin.tar.gz

hebasto approved
hebasto commented at 9:41 AM on April 24, 2022: member

ACK 51d06df8746828ffac39ac94f9efa3332b3f0556
fanquake approved

fanquake commented at 8:44 AM on April 25, 2022: member

ACK 51d06df8746828ffac39ac94f9efa3332b3f0556 - recreated the tarball, but didn't run a Guix build.

shasum -a 256 Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz
df75d30ecafc429e905134333aeae56ac65fac67cb4182622398fd717df77619  Xcode-12.2-12B45b-extracted-SDK-with-libcxx-headers.tar.gz

fanquake merged this on Apr 25, 2022
fanquake closed this on Apr 25, 2022
prusnak deleted the branch on Apr 25, 2022
jarolrod commented at 4:20 AM on April 26, 2022: member

post merge ack, was able to recreate the tarball and then ran a guix build
sidhujag referenced this in commit ad8a91388f on Apr 26, 2022
DrahtBot locked this on Apr 26, 2023

Contributors

Labels

Linked (view graph)

#24947 Permissions corrupted in gen-sdk macosx headers