mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-26 19:23:26 -03:00
Merge bitcoin/bitcoin#24514: [23.x] Second round signapple backports (M1)
1fd91da454
build, mac: Include arch in codesignature tarball (Andrew Chow)eba46583ed
guix: use latest signapple (Andrew Chow) Pull request description: This backports additional signapple and macOS codesigning changes from #24506 for 23.x (skipping #24503, which is an interim signapple update, and the certvalidator change, which is not strictly necessary), and should complete the changes required to perform M1 codesigning for the 23.x release. ACKs for top commit: hebasto: ACK1fd91da454
, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 55b7e0680058203744dc491da060ef56a880270a01c10e475b7a171457902410806895dbe7332a323ce47c2a776337fa29eb811d2511fce84ede13aeacbe2a02
This commit is contained in:
commit
2bd5fdbced
2 changed files with 5 additions and 3 deletions
|
@ -490,7 +490,7 @@ and endian independent.")
|
|||
(license license:expat)))
|
||||
|
||||
(define-public python-signapple
|
||||
(let ((commit "b084cbbf44d5330448ffce0c7d118f75781b64bd"))
|
||||
(let ((commit "0777ce58e61b0e6be753a5f524149d6d47905186"))
|
||||
(package
|
||||
(name "python-signapple")
|
||||
(version (git-version "0.1" "1" commit))
|
||||
|
@ -503,7 +503,7 @@ and endian independent.")
|
|||
(file-name (git-file-name name commit))
|
||||
(sha256
|
||||
(base32
|
||||
"0k7inccl2mzac3wq4asbr0kl8s4cghm8982z54kfascqg45shv01"))))
|
||||
"19axspyyfqbrfw2r53c17mi9bvm8zsb39mz8v9h7c173qkm3x5ym"))))
|
||||
(build-system python-build-system)
|
||||
(propagated-inputs
|
||||
`(("python-asn1crypto" ,python-asn1crypto)
|
||||
|
|
|
@ -8,9 +8,11 @@ set -e
|
|||
|
||||
ROOTDIR=dist
|
||||
BUNDLE="${ROOTDIR}/Bitcoin-Qt.app"
|
||||
BINARY="${BUNDLE}/Contents/MacOS/Bitcoin-Qt"
|
||||
SIGNAPPLE=signapple
|
||||
TEMPDIR=sign.temp
|
||||
OUT=signature-osx.tar.gz
|
||||
ARCH=$(${SIGNAPPLE} info ${BINARY} | head -n 1 | cut -d " " -f 1)
|
||||
OUT="signature-osx-${ARCH}.tar.gz"
|
||||
OUTROOT=osx/dist
|
||||
|
||||
if [ -z "$1" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue