guix: fix flatpak sha256sums.part

This commit is contained in:
tobtoht 2024-03-19 09:03:13 +01:00
parent 918aee140e
commit 41aebef145
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
3 changed files with 3 additions and 5 deletions

View file

@ -101,4 +101,4 @@ mv "${DISTNAME}-flatpak.zip" /output
cd /output cd /output
rm feather rm feather
sha256sum "${DISTNAME}-flatpak.zip" > SHA256SUMS.part sha256sum "${DISTNAME}-flatpak.zip" > "${LOGDIR}/SHA256SUMS.part"

View file

@ -121,8 +121,6 @@ if (( ${#sha256sum_fragments[@]} )); then
for logdir in "${sha256sum_fragments[@]}"; do for logdir in "${sha256sum_fragments[@]}"; do
echo " '$logdir'" echo " '$logdir'"
case "$logdir" in case "$logdir" in
"$LOGDIR_BASE"/*.pack/SHA256SUMS.part)
;;
"$LOGDIR_BASE"/*-codesigned/SHA256SUMS.part) "$LOGDIR_BASE"/*-codesigned/SHA256SUMS.part)
codesigned_fragments+=("$logdir") codesigned_fragments+=("$logdir")
;; ;;
@ -137,8 +135,6 @@ else
exit 1 exit 1
fi fi
noncodesigned_fragments+=("$OUTDIR_BASE/x86_64-linux-gnu.pack/SHA256SUMS.part")
############## ##############
## Attest ## ## Attest ##
############## ##############

View file

@ -471,6 +471,7 @@ EOF
--share="$PWD"=/feather \ --share="$PWD"=/feather \
--share="$PACK"=/pack \ --share="$PACK"=/pack \
--share="$(outdir_for_host "$host")"=/output \ --share="$(outdir_for_host "$host")"=/output \
--share="$LOGDIR_BASE"=/logdir-base \
--share="$FEATHER_BIN"=/feather-bin \ --share="$FEATHER_BIN"=/feather-bin \
--keep-failed \ --keep-failed \
--fallback \ --fallback \
@ -479,6 +480,7 @@ EOF
${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \ ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
-- env DISTNAME="$DISTNAME" \ -- env DISTNAME="$DISTNAME" \
SOURCE_DATE_EPOCH="${COMMIT_TIMESTAMP:?unable to determine value}" \ SOURCE_DATE_EPOCH="${COMMIT_TIMESTAMP:?unable to determine value}" \
LOGDIR="$(LOGDIR_BASE=/logdir-base && logdir_for_host "$host")" \
VERSION="$VERSION" \ VERSION="$VERSION" \
bash -c "cd /feather && \ bash -c "cd /feather && \
bash contrib/flatpak/make_flatpak.sh" bash contrib/flatpak/make_flatpak.sh"