File tree Expand file tree Collapse file tree 3 files changed +23
-17
lines changed Expand file tree Collapse file tree 3 files changed +23
-17
lines changed Original file line number Diff line number Diff line change @@ -230,20 +230,7 @@ if [ ! -e "$GIT_ARCHIVE" ]; then
230230 git archive --prefix=" ${DISTNAME} /" --output=" $GIT_ARCHIVE " HEAD
231231fi
232232
233- # tmpdir="$(mktemp -d)"
234- # (
235- # cd "$tmpdir"
236- # mkdir -p inputs
237- # ln -sf --target-directory=inputs "$GIT_ARCHIVE"
238-
239- # mkdir -p "$OUTDIR"
240- # find -L inputs -type f -print0 | xargs -0 sha256sum > "${OUTDIR}/inputs.SHA256SUMS"
241- # )
242-
243233mkdir -p " $OUTDIR "
244- cat << EOF > "$OUTDIR "/inputs.SHA256SUMS
245- $( sha256sum " $GIT_ARCHIVE " | cut -d' ' -f1) inputs/$( basename " $GIT_ARCHIVE " )
246- EOF
247234
248235# ##########################
249236# Binary Tarball Building #
@@ -450,3 +437,13 @@ mkdir -p "$DISTSRC"
450437rm -rf " $ACTUAL_OUTDIR "
451438mv --no-target-directory " $OUTDIR " " $ACTUAL_OUTDIR " \
452439 || ( rm -rf " $ACTUAL_OUTDIR " && exit 1 )
440+
441+ (
442+ cd /outdir-base
443+ {
444+ echo " $GIT_ARCHIVE "
445+ find " $ACTUAL_OUTDIR " -type f
446+ } | xargs realpath --relative-base=" $PWD " \
447+ | xargs sha256sum \
448+ | sponge " $ACTUAL_OUTDIR " /SHA256SUMS.part
449+ )
Original file line number Diff line number Diff line change @@ -55,10 +55,6 @@ if [ ! -e "$CODESIGNATURE_GIT_ARCHIVE" ]; then
5555fi
5656
5757mkdir -p " $OUTDIR "
58- cat << EOF > "$OUTDIR "/inputs.SHA256SUMS
59- $( sha256sum " $UNSIGNED_TARBALL " | cut -d' ' -f1) inputs/$( basename " $UNSIGNED_TARBALL " )
60- $( sha256sum " $CODESIGNATURE_GIT_ARCHIVE " | cut -d' ' -f1) inputs/$( basename " $CODESIGNATURE_GIT_ARCHIVE " )
61- EOF
6258
6359mkdir -p " $DISTSRC "
6460(
@@ -103,3 +99,14 @@ mkdir -p "$DISTSRC"
10399rm -rf " $ACTUAL_OUTDIR "
104100mv --no-target-directory " $OUTDIR " " $ACTUAL_OUTDIR " \
105101 || ( rm -rf " $ACTUAL_OUTDIR " && exit 1 )
102+
103+ (
104+ cd /outdir-base
105+ {
106+ echo " $UNSIGNED_TARBALL "
107+ echo " $CODESIGNATURE_GIT_ARCHIVE "
108+ find " $ACTUAL_OUTDIR " -type f
109+ } | xargs realpath --relative-base=" $PWD " \
110+ | xargs sha256sum \
111+ | sponge " $ACTUAL_OUTDIR " /SHA256SUMS.part
112+ )
Original file line number Diff line number Diff line change 2222 (gnu packages linux)
2323 (gnu packages llvm)
2424 (gnu packages mingw)
25+ (gnu packages moreutils)
2526 (gnu packages perl)
2627 (gnu packages pkg-config)
2728 (gnu packages python)
@@ -572,6 +573,7 @@ inspecting signatures in Mach-O binaries.")
572573 patch
573574 gawk
574575 sed
576+ moreutils
575577 ; ; Compression and archiving
576578 tar
577579 bzip2
You can’t perform that action at this time.
0 commit comments