guix: fix flatpak sha256sums.part

diff --git a/contrib/flatpak/make_flatpak.sh b/contrib/flatpak/make_flatpak.sh
index 72e53e4f1de7f3d97780059d2a816f65c391c1ac..4f01c83a31881a400c2179ee25f74bf46ed68877 100644 (file)
--- a/contrib/flatpak/make_flatpak.sh
+++ b/contrib/flatpak/make_flatpak.sh
@@ -101,4 +101,4 @@ mv "${DISTNAME}-flatpak.zip" /output
 cd /output
 rm feather
 
-sha256sum "${DISTNAME}-flatpak.zip" > SHA256SUMS.part
\ No newline at end of file
+sha256sum "${DISTNAME}-flatpak.zip" > "${LOGDIR}/SHA256SUMS.part"
\ No newline at end of file

diff --git a/contrib/guix/guix-attest b/contrib/guix/guix-attest
index 3f016d608db58b2707514b915fe9a8a8ea3a13d2..1f07a20510b1c5f1f5138f9031d27c8b69472626 100755 (executable)
--- a/contrib/guix/guix-attest
+++ b/contrib/guix/guix-attest
@@ -121,8 +121,6 @@ if (( ${#sha256sum_fragments[@]} )); then
     for logdir in "${sha256sum_fragments[@]}"; do
         echo "    '$logdir'"
         case "$logdir" in
-            "$LOGDIR_BASE"/*.pack/SHA256SUMS.part)
-                ;;
             "$LOGDIR_BASE"/*-codesigned/SHA256SUMS.part)
                 codesigned_fragments+=("$logdir")
                 ;;
@@ -137,8 +135,6 @@ else
     exit 1
 fi
 
-noncodesigned_fragments+=("$OUTDIR_BASE/x86_64-linux-gnu.pack/SHA256SUMS.part")
-
 ##############
 ##  Attest  ##
 ##############

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