Skip to content

contrib: macdeploy: fix typo in permissions#24948

Merged
fanquake merged 1 commit intobitcoin:masterfrom
prusnak:fix-gen-sdk
Apr 25, 2022
Merged

contrib: macdeploy: fix typo in permissions#24948
fanquake merged 1 commit intobitcoin:masterfrom
prusnak:fix-gen-sdk

Conversation

@prusnak
Copy link
Contributor

@prusnak prusnak commented Apr 22, 2022

Fixes #24947

@prusnak prusnak mentioned this pull request Apr 22, 2022
Closed
@prusnak prusnak marked this pull request as draft April 22, 2022 20:03
@prusnak prusnak marked this pull request as ready for review April 22, 2022 20:10
@laanwj
Copy link
Member

laanwj commented Apr 22, 2022 •
edited
Loading

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 😊 )

sha256sum:

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

Edit: tested ACK 51d06df

  • 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

@bitcoin bitcoin deleted a comment from Beckyscrypto Apr 23, 2022
@hebasto
Copy link
Member

hebasto commented Apr 24, 2022 •
edited
Loading

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
hebasto approved these changes Apr 24, 2022
View reviewed changes
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 51d06df

fanquake
fanquake approved these changes Apr 25, 2022
View reviewed changes
Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 51d06df - 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 fanquake merged commit b31ba3a into bitcoin:master Apr 25, 2022
@prusnak prusnak deleted the fix-gen-sdk branch April 25, 2022 09:08
@jarolrod
Copy link
Contributor

jarolrod commented Apr 26, 2022

post merge ack, was able to recreate the tarball and then ran a guix build

sidhujag pushed a commit to syscoin/syscoin that referenced this pull request Apr 26, 2022
@fanquake
Merge bitcoin#24948: contrib: macdeploy: fix typo in permissions
ad8a913 
51d06df contrib: macdeploy: fix permissions typo in gen-sdk script (Pavol Rusnak)

Pull request description:

  Fixes 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
@bitcoin bitcoin locked and limited conversation to collaborators Apr 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@fanquake fanquake fanquake approved these changes

@hebasto hebasto hebasto approved these changes

Assignees

No one assigned

Labels

Scripts and tools

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Permissions corrupted in gen-sdk macosx headers

6 participants

@prusnak @laanwj @hebasto @jarolrod @fanquake @DrahtBot