mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

guix: Use $HOST instead of generic osx{64} for macOS artifacts

Browse Source
This commit is contained in:
Hennadii Stepanov committed 2022-03-13 11:04:52 +01:00
1 parent f94784f5bc
commit 933a43018f
3 files changed
+7 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

contrib/guix/guix-codesign
+1 -1
View File
@@ -155,7 +155,7 @@ unsigned_tarball_for_host() {
echo "$(outdir_for_host "$1")/${DISTNAME}-win-unsigned.tar.gz" echo "$(outdir_for_host "$1")/${DISTNAME}-win-unsigned.tar.gz"
;; ;;
*darwin*) *darwin*)
echo "$(outdir_for_host "$1")/${DISTNAME}-osx-unsigned.tar.gz" echo "$(outdir_for_host "$1")/${DISTNAME}-${1}-unsigned.tar.gz"
;; ;;
*) *)
exit 1 exit 1
contrib/guix/libexec/build.sh
+5 -5
View File
@@ -348,10 +348,10 @@ mkdir -p "$DISTSRC"
find . -print0 \ find . -print0 \
| sort --zero-terminated \ | sort --zero-terminated \
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \ | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
| gzip -9n > "${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz" \ | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-osx-unsigned.tar.gz" && exit 1 ) || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-unsigned.tar.gz" && exit 1 )
) )
make deploy ${V:+V=1} OSX_DMG="${OUTDIR}/${DISTNAME}-osx-unsigned.dmg" make deploy ${V:+V=1} OSX_DMG="${OUTDIR}/${DISTNAME}-${HOST}-unsigned.dmg"
;; ;;
esac esac
( (
@@ -423,8 +423,8 @@ mkdir -p "$DISTSRC"
find "${DISTNAME}" -print0 \ find "${DISTNAME}" -print0 \
| sort --zero-terminated \ | sort --zero-terminated \
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \ | tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin/osx64}.tar.gz" \ | gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" \
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST//x86_64-apple-darwin/osx64}.tar.gz" && exit 1 ) || ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}.tar.gz" && exit 1 )
;; ;;
esac esac
) # $DISTSRC/installed ) # $DISTSRC/installed
contrib/guix/libexec/codesign.sh
+1 -1
View File
@@ -91,7 +91,7 @@ mkdir -p "$DISTSRC"
-- -volume_date all_file_dates ="$SOURCE_DATE_EPOCH" -- -volume_date all_file_dates ="$SOURCE_DATE_EPOCH"
# Compress uncompressed.dmg and output to OUTDIR # Compress uncompressed.dmg and output to OUTDIR
./dmg dmg uncompressed.dmg "${OUTDIR}/${DISTNAME}-osx-signed.dmg" ./dmg dmg uncompressed.dmg "${OUTDIR}/${DISTNAME}-${HOST}-signed.dmg"
;; ;;
*) *)
exit 1 exit 1