Merge bitcoin/bitcoin#21462: guix: Add guix-{attest,verify} scripts
d420e5c1c0guix-attest: Avoid incomplete sigdirs with ERR traps (Carl Dong)feda2c8e31guix: Skip attesting to dist-archive (Carl Dong)d522d8006bguix: Attest to inputs in inputs.SHA256SUMS (Carl Dong)f9e2960c01guix: Construct $OUTDIR in ${DISTSRC}/output (Carl Dong)022abc85fcguix: Minor quoting fix in libexec/build.sh (Carl Dong)c83c4fa5b7guix-attest: Allow skipping GPG signing with NO_SIGN (Carl Dong)0e1c2e448cguix-attest: Use ascii-armor signatures (Carl Dong)b5fd89c4c8guix-attest: Only use cross-platform flags for find+xargs (Carl Dong)5926432ba6guix: Add guix-verify script (Carl Dong)30daf76a97guix: Add guix-attest script (Carl Dong) Pull request description: Adds replacements for `gsign` and `gverify`. Personally I'm not a big fan of using the word "sign" as it's been used to refer to both codesigning and GPG signing. ACKs for top commit: laanwj: Code review and tested ACKd420e5c1c0Tree-SHA512: 93d82d201f4596eaea0e3825aa55b013dfb91790e6ccee79893833d37921513d7b4e735f0641103e1e2ea8308abe4cb6218b73160924708802f2e0e3f7f6caf1
This commit is contained in:
3 files changed
+343
-1
No files matched your search
@@ -33,6 +33,9 @@ Required environment variables as seen inside the container:
|
||||
OUTDIR: ${OUTDIR:?not set}
|
||||
EOF
|
||||
|
||||
ACTUAL_OUTDIR="${OUTDIR}"
|
||||
OUTDIR="${DISTSRC}/output"
|
||||
|
||||
#####################
|
||||
# Environment Setup #
|
||||
#####################
|
||||
@@ -224,9 +227,25 @@ GIT_ARCHIVE="${DIST_ARCHIVE_BASE}/${DISTNAME}.tar.gz"
|
||||
# Create the source tarball if not already there
|
||||
if [ ! -e "$GIT_ARCHIVE" ]; then
|
||||
mkdir -p "$(dirname "$GIT_ARCHIVE")"
|
||||
touch "${DIST_ARCHIVE_BASE}"/SKIPATTEST.TAG
|
||||
git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
|
||||
fi
|
||||
|
||||
# tmpdir="$(mktemp -d)"
|
||||
# (
|
||||
# cd "$tmpdir"
|
||||
# mkdir -p inputs
|
||||
# ln -sf --target-directory=inputs "$GIT_ARCHIVE"
|
||||
|
||||
# mkdir -p "$OUTDIR"
|
||||
# find -L inputs -type f -print0 | xargs -0 sha256sum > "${OUTDIR}/inputs.SHA256SUMS"
|
||||
# )
|
||||
|
||||
mkdir -p "$OUTDIR"
|
||||
cat << EOF > "$OUTDIR"/inputs.SHA256SUMS
|
||||
$(sha256sum "$GIT_ARCHIVE" | cut -d' ' -f1) inputs/$(basename "$GIT_ARCHIVE")
|
||||
EOF
|
||||
|
||||
###########################
|
||||
# Binary Tarball Building #
|
||||
###########################
|
||||
@@ -292,7 +311,8 @@ mkdir -p "$DISTSRC"
|
||||
# version symbols for Linux distro back-compatibility.
|
||||
make -C src --jobs=1 check-symbols ${V:+V=1}
|
||||
|
||||
mkdir -p ${OUTDIR}
|
||||
mkdir -p "$OUTDIR"
|
||||
|
||||
# Make the os-specific installers
|
||||
case "$HOST" in
|
||||
*mingw*)
|
||||
@@ -427,3 +447,5 @@ mkdir -p "$DISTSRC"
|
||||
;;
|
||||
esac
|
||||
) # $DISTSRC
|
||||
|
||||
mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR"
|
||||
Reference in new issue
Block a user