From deccc506314c467f1e87e0a48a94626df841fe63 Mon Sep 17 00:00:00 2001 From: Andrew Chow Date: Mon, 30 Oct 2023 14:27:37 -0400 Subject: [PATCH] guix: Zip needs to include all files with time as SOURCE_DATE_EPOCH The zip for codesigned MacOS distribution needs to have all files have the same timestamp. These files also need to be included in the zip as zip is not automatically recursive. We use the same pattern for zip as is done for the other zip files produced by guix. Github-Pull: #28757 Rebased-From: f6f18eeaa88784e487e9bca8c5ace6c66bd721cc --- contrib/guix/libexec/codesign.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/guix/libexec/codesign.sh b/contrib/guix/libexec/codesign.sh index 0b5f77d01ea..54edfecb268 100755 --- a/contrib/guix/libexec/codesign.sh +++ b/contrib/guix/libexec/codesign.sh @@ -86,7 +86,11 @@ mkdir -p "$DISTSRC" signapple apply dist/Bitcoin-Qt.app codesignatures/osx/dist # Make a .zip from dist/ - zip "${OUTDIR}/${DISTNAME}-${HOST}.zip" dist/* + cd dist/ + find . -print0 \ + | xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}" + find . | sort \ + | zip -X@ "${OUTDIR}/${DISTNAME}-${HOST}.zip" ;; *) exit 1