highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-07 21:50:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge bitcoin/bitcoin#24506: build, mac: Include arch in codesignature tarball

Browse Source 
0189df1d3171082caf743ef3b0968f43c71303f5 build, mac: Include arch in codesignature tarball (Andrew Chow)
6e9308c6d4ed9fbf909c7234ae31245747183be3 guix: use latest signapple (Andrew Chow)

Pull request description:

  Since we have two architectures for Mac binaries, having the architecture in the code signature tarball generated by `detached-sig-create.sh` allows us to avoid accidentally overwriting an existing code signature tarball during the code signing process.

ACKs for top commit:
  fanquake:
    ACK 0189df1d3171082caf743ef3b0968f43c71303f5

Tree-SHA512: 7e0d282e4ced1094f36f1d26ff6e18d53449561ab3a1a95ac69eb5ff3d7b33ee4bd8fad004884806064a29541c47f9e5879c2a1fd0f54453413245bdcf53c4c7
This commit is contained in:
fanquake 2022-03-09 17:56:26 +00:00
commit 430acb7d2a
No known key found for this signature in database
GPG Key ID: 2EEB9F5CC09526C1
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/guix/manifest.scm
View File

@ -485,7 +485,7 @@ and endian independent.")
(license license:expat))) (license license:expat)))
(define-public python-signapple (define-public python-signapple
(let ((commit "9f42f3c8295d4107ee7a22e523ec17449a936f43")) (let ((commit "0777ce58e61b0e6be753a5f524149d6d47905186"))
(package (package
(name "python-signapple") (name "python-signapple")
(version (git-version "0.1" "1" commit)) (version (git-version "0.1" "1" commit))
@ -498,7 +498,7 @@ and endian independent.")
(file-name (git-file-name name commit)) (file-name (git-file-name name commit))
(sha256 (sha256
(base32 (base32
"0j1sqi0g8k2z5y56iayh5pw9yyq1r6ry3q5zy0cdy2sispiwvdnp")))) "19axspyyfqbrfw2r53c17mi9bvm8zsb39mz8v9h7c173qkm3x5ym"))))
(build-system python-build-system) (build-system python-build-system)
(propagated-inputs (propagated-inputs
`(("python-asn1crypto" ,python-asn1crypto) `(("python-asn1crypto" ,python-asn1crypto)

4
contrib/macdeploy/detached-sig-create.sh
View File

@ -8,9 +8,11 @@ set -e
ROOTDIR=dist ROOTDIR=dist
BUNDLE="${ROOTDIR}/Bitcoin-Qt.app" BUNDLE="${ROOTDIR}/Bitcoin-Qt.app"
BINARY="${BUNDLE}/Contents/MacOS/Bitcoin-Qt"
SIGNAPPLE=signapple SIGNAPPLE=signapple
TEMPDIR=sign.temp 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 OUTROOT=osx/dist
if [ -z "$1" ]; then if [ -z "$1" ]; then