From 8d9f9f72262777faab36fc8697f18b1e28c7d181 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 6 May 2020 13:37:02 +0000
Subject: [PATCH 1/4] build: Abstract release tarball generation to a utility
 script make_release_tarball

---
 contrib/guix/libexec/build.sh                |  2 +-
 contrib/guix/libexec/make_release_tarball.sh | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100755 contrib/guix/libexec/make_release_tarball.sh

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index c375dc9716..9f9295f09f 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -230,7 +230,7 @@ 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")"
-    git archive --prefix="${DISTNAME}/" --output="$GIT_ARCHIVE" HEAD
+    contrib/guix/libexec/make_release_tarball.sh "${GIT_ARCHIVE}" "${DISTNAME}"
 fi
 
 mkdir -p "$OUTDIR"
diff --git a/contrib/guix/libexec/make_release_tarball.sh b/contrib/guix/libexec/make_release_tarball.sh
new file mode 100755
index 0000000000..7d482a6de4
--- /dev/null
+++ b/contrib/guix/libexec/make_release_tarball.sh
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Copyright (c) 2020 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# A helper script to generate source release tarball
+
+export LC_ALL=C
+set -ex
+
+[ "$#" -ge 2 ]
+
+GIT_ARCHIVE="$1"
+DISTNAME="$2"
+
+git archive --prefix="${DISTNAME}/" --output="${GIT_ARCHIVE}" HEAD

From 690985474a5a176046ee37cc26bc6c9a91c8f671 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Wed, 29 Apr 2020 00:23:13 +0000
Subject: [PATCH 2/4] build: Run autogen & distclean when generating source
 tarball

---
 contrib/guix/libexec/build.sh                |  3 +--
 contrib/guix/libexec/make_release_tarball.sh | 22 +++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index 9f9295f09f..e9f3cf5705 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -230,6 +230,7 @@ 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")"
+    CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" \
     contrib/guix/libexec/make_release_tarball.sh "${GIT_ARCHIVE}" "${DISTNAME}"
 fi
 
@@ -283,8 +284,6 @@ mkdir -p "$DISTSRC"
     # Extract the source tarball
     tar --strip-components=1 -xf "${GIT_ARCHIVE}"
 
-    ./autogen.sh
-
     # Configure this DISTSRC for $HOST
     # shellcheck disable=SC2086
     env CONFIG_SITE="${BASEPREFIX}/${HOST}/share/config.site" \
diff --git a/contrib/guix/libexec/make_release_tarball.sh b/contrib/guix/libexec/make_release_tarball.sh
index 7d482a6de4..f930b78e09 100755
--- a/contrib/guix/libexec/make_release_tarball.sh
+++ b/contrib/guix/libexec/make_release_tarball.sh
@@ -13,4 +13,24 @@ set -ex
 GIT_ARCHIVE="$1"
 DISTNAME="$2"
 
-git archive --prefix="${DISTNAME}/" --output="${GIT_ARCHIVE}" HEAD
+git archive --prefix="${DISTNAME}/" HEAD | tar -xp
+cd "${DISTNAME}"
+
+./autogen.sh
+./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking
+make distclean
+
+cd ..
+tar \
+  --format=ustar \
+  --exclude autom4te.cache \
+  --exclude .deps \
+  --exclude .git \
+  --sort=name \
+  --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 \
+  --mtime="${REFERENCE_DATETIME}" \
+  -c "${DISTNAME}" | \
+  gzip -9n \
+  >"${GIT_ARCHIVE}"
+
+rm -rf "${DISTNAME}"

From 7bbfd6bc603ef4bcf07e43cea4b6e52724bd7750 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Fri, 12 Feb 2016 05:36:55 +0000
Subject: [PATCH 3/4] Bugfix: Only use git for build info if the repository is
 actually the right one

Original-Github-Pull: #7522
Rebased-From: e98e3dde6a976a2c8f266ee963d6931fd4b37262 e98e3dde6a976a2c8f266ee963d6931fd4b37262
---
 share/genbuild.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/share/genbuild.sh b/share/genbuild.sh
index ecc96160e6..26c1baa4a8 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -18,9 +18,14 @@ else
     exit 1
 fi
 
+# This checks that we are actually part of the intended git repository, and not just getting info about some unrelated git repository that the code happens to be in a directory under
+git_check_in_repo() {
+    ! { git status --porcelain -uall --ignored "$@" 2>/dev/null || echo '??'; } | grep -q '?'
+}
+
 GIT_TAG=""
 GIT_COMMIT=""
-if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then
+if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" ] && [ -e "$(command -v git)" ] && [ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ] && git_check_in_repo share/genbuild.sh; then
     # clean 'dirty' status of touched files that haven't been modified
     git diff >/dev/null 2>/dev/null
 

From dc4201038746cbda9dad1399e0595cd9b5bd260d Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Thu, 7 May 2020 01:46:47 +0000
Subject: [PATCH 4/4] build: Include tag name in release tarball for build.h

---
 contrib/guix/libexec/make_release_tarball.sh | 5 +++++
 share/genbuild.sh                            | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/contrib/guix/libexec/make_release_tarball.sh b/contrib/guix/libexec/make_release_tarball.sh
index f930b78e09..c99e6fb500 100755
--- a/contrib/guix/libexec/make_release_tarball.sh
+++ b/contrib/guix/libexec/make_release_tarball.sh
@@ -14,6 +14,11 @@ GIT_ARCHIVE="$1"
 DISTNAME="$2"
 
 git archive --prefix="${DISTNAME}/" HEAD | tar -xp
+
+# Generate correct build info file from git, before we lose git
+GIT_BUILD_INFO="$(share/genbuild.sh /dev/stdout)"
+sed 's/\/\/ No build information available/'"${GIT_BUILD_INFO}"'/' -i "${DISTNAME}/share/genbuild.sh"
+
 cd "${DISTNAME}"
 
 ./autogen.sh
diff --git a/share/genbuild.sh b/share/genbuild.sh
index 26c1baa4a8..963113ae2c 100755
--- a/share/genbuild.sh
+++ b/share/genbuild.sh
@@ -45,7 +45,9 @@ if [ -n "$GIT_TAG" ]; then
 elif [ -n "$GIT_COMMIT" ]; then
     NEWINFO="#define BUILD_GIT_COMMIT \"$GIT_COMMIT\""
 else
-    NEWINFO="// No build information available"
+    # NOTE: The NEWINFO line below this comment gets replaced by a string-match in contrib/guix/libexec/make_release_tarball.sh
+    # If changing it, update the script too!
+    NEWINFO='// No build information available'
 fi
 
 # only update build.h if necessary