diff options
| author | laanwj <126646+laanwj@users.noreply.github.com> | 2022-03-17 09:46:24 +0100 |
|---|---|---|
| committer | laanwj <126646+laanwj@users.noreply.github.com> | 2022-03-17 09:47:42 +0100 |
| commit | 55a60b971802753f94dd0e9f9622b5c10760de1d (patch) | |
| tree | 185189fc5b95e8ebc8755b77ae3be4971ecd46df /contrib/guix/guix-codesign | |
| parent | 71866d856679faa501c2cecad3c1820e31f13a9b (diff) | |
| parent | 61c021605f8733891cb8d92509c84ac814d3712a (diff) | |
| download | bitcoin-55a60b971802753f94dd0e9f9622b5c10760de1d.tar.xz | |
Merge bitcoin/bitcoin#24593: [23.x] macOS / build backports
61c021605f8733891cb8d92509c84ac814d3712a doc, guix: Include arm64-apple-darwin into codesigned archs (Hennadii Stepanov)
f541a252f676dcdab15654e8b2b83b2dbcee46b3 doc: Drop a note about Intel-based Macs (Hennadii Stepanov)
dd2c7f71fd0f759d0d724ff182b508fc2db59131 guix: Use "win64" for Windows artifacts consistently (Hennadii Stepanov)
2e7cde8f6851be73477766bac00c4c922d79370f guix: Drop "-signed" suffix for signed macOS .dmg files (Hennadii Stepanov)
7f6420c833fe63e51ec094c1484969d29aac415b guix: Use $HOST instead of generic osx{64} for macOS artifacts (Hennadii Stepanov)
de528793b6912dd657c7197b1a01c2da708f0a1f Update signapple for platform identifier fix (Andrew Chow)
Pull request description:
Backports:
* #24549
* #24573
* #24588
* #24597
ACKs for top commit:
laanwj:
Code review ACK 61c021605f8733891cb8d92509c84ac814d3712a
Tree-SHA512: 023bfe6f1a31cec66f0255fb8e9c186f44a50a900a9f22c65b2da672b413fec7570f0f11626317344b6f91e74610006ffe0e35243af510de1eb8a3ceb8e8d37f
Diffstat (limited to 'contrib/guix/guix-codesign')
| -rwxr-xr-x | contrib/guix/guix-codesign | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign index 8be927bd06..5268da35b1 100755 --- a/contrib/guix/guix-codesign +++ b/contrib/guix/guix-codesign @@ -155,7 +155,7 @@ unsigned_tarball_for_host() { echo "$(outdir_for_host "$1")/${DISTNAME}-win-unsigned.tar.gz" ;; *darwin*) - echo "$(outdir_for_host "$1")/${DISTNAME}-osx-unsigned.tar.gz" + echo "$(outdir_for_host "$1")/${DISTNAME}-${1}-unsigned.tar.gz" ;; *) exit 1 |