Skip to content

Commit 559ca65

Browse files
committed
guix: restore macos codesig
Matches that of Bitcoin Core minus the desktop zip.
1 parent 919feae commit 559ca65

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

contrib/guix/libexec/build.sh

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,19 @@ mkdir -p "$DISTSRC"
361361
)
362362
;;
363363
*darwin*)
364-
# Don't create desktop zip
364+
mkdir -p "unsigned-app-${HOST}"
365+
cp --target-directory="unsigned-app-${HOST}" \
366+
contrib/macdeploy/detached-sig-create.sh
367+
cp -r --target-directory="unsigned-app-${HOST}" "${INSTALLPATH}"
368+
(
369+
cd "unsigned-app-${HOST}"
370+
find . -print0 \
371+
| sort --zero-terminated \
372+
| tar --create --no-recursion --mode='u+rw,go+r-w,a+X' --null --files-from=- \
373+
| gzip -9n > "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" \
374+
|| ( rm -f "${OUTDIR}/${DISTNAME}-${HOST}-codesigning.tar.gz" && exit 1 )
375+
)
376+
;;
365377
esac
366378
) # $DISTSRC
367379

contrib/guix/libexec/codesign.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,6 @@ mkdir -p "$DISTSRC"
114114
signapple apply "${bin}" "codesignatures/osx/${HOST}/${bin}.${ARCH}sign"
115115
done
116116

117-
# Make a .zip from dist/
118-
cd dist/
119-
find . -print0 \
120-
| xargs -0r touch --no-dereference --date="@${SOURCE_DATE_EPOCH}"
121-
find . | sort \
122-
| zip -X@ "${OUTDIR}/${DISTNAME}-${HOST}.zip"
123-
cd ..
124-
125117
# Make a .tar.gz from bins
126118
find "${DISTNAME}" -print0 \
127119
| sort --zero-terminated \

0 commit comments

Comments
 (0)