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
230
230
git archive --prefix=" ${DISTNAME} /" --output=" $GIT_ARCHIVE " HEAD
231
231
fi
232
232
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
-
243
233
mkdir -p " $OUTDIR "
244
- cat << EOF > "$OUTDIR "/inputs.SHA256SUMS
245
- $( sha256sum " $GIT_ARCHIVE " | cut -d' ' -f1) inputs/$( basename " $GIT_ARCHIVE " )
246
- EOF
247
234
248
235
# ##########################
249
236
# Binary Tarball Building #
@@ -450,3 +437,13 @@ mkdir -p "$DISTSRC"
450
437
rm -rf " $ACTUAL_OUTDIR "
451
438
mv --no-target-directory " $OUTDIR " " $ACTUAL_OUTDIR " \
452
439
|| ( 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
55
55
fi
56
56
57
57
mkdir -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
62
58
63
59
mkdir -p " $DISTSRC "
64
60
(
@@ -103,3 +99,14 @@ mkdir -p "$DISTSRC"
103
99
rm -rf " $ACTUAL_OUTDIR "
104
100
mv --no-target-directory " $OUTDIR " " $ACTUAL_OUTDIR " \
105
101
|| ( 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 22
22
(gnu packages linux)
23
23
(gnu packages llvm)
24
24
(gnu packages mingw)
25
+ (gnu packages moreutils)
25
26
(gnu packages perl)
26
27
(gnu packages pkg-config)
27
28
(gnu packages python)
@@ -572,6 +573,7 @@ inspecting signatures in Mach-O binaries.")
572
573
patch
573
574
gawk
574
575
sed
576
+ moreutils
575
577
; ; Compression and archiving
576
578
tar
577
579
bzip2
You can’t perform that action at this time.
0 commit comments