diff options
| author | Andrew Chow <achow101-github@achow101.com> | 2021-07-23 15:15:36 -0400 |
|---|---|---|
| committer | Andrew Chow <achow101-github@achow101.com> | 2021-07-28 12:59:47 -0400 |
| commit | 9b313dfef18792fcc36e78ef3caa693fafcce04e (patch) | |
| tree | 412e1053add5ec13a4daf0053a032bc363cd32f4 /contrib/guix | |
| parent | 43225f0a2a517ccd79dc49279b979ffd2eca6b85 (diff) | |
| download | bitcoin-9b313dfef18792fcc36e78ef3caa693fafcce04e.tar.xz | |
guix: Ensure EPOCH_SOURCE_DATE does not include GPG information
If the user has set log.showSignature=true in their git config, then the
git log will always output GPG signature information. Since git log is
used to set EPOCH_SOURCE_DATE, this will mistakenly have GPG signature
information in it which causes issues for the build. To avoid this
issue, we override the config and force log.showSignature=false.
Diffstat (limited to 'contrib/guix')
| -rwxr-xr-x | contrib/guix/guix-build | 2 | ||||
| -rwxr-xr-x | contrib/guix/guix-codesign | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index f6da8435e9..3d9335b4b0 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -232,7 +232,7 @@ host_to_commonname() { } # Determine the reference time used for determinism (overridable by environment) -SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" +SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --format=%at -1)}" # Execute "$@" in a pinned, possibly older version of Guix, for reproducibility # across time. diff --git a/contrib/guix/guix-codesign b/contrib/guix/guix-codesign index 11610a92e1..3f464f89e6 100755 --- a/contrib/guix/guix-codesign +++ b/contrib/guix/guix-codesign @@ -220,7 +220,7 @@ fi JOBS="${JOBS:-$(nproc)}" # Determine the reference time used for determinism (overridable by environment) -SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git log --format=%at -1)}" +SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(git -c log.showSignature=false log --format=%at -1)}" # Execute "$@" in a pinned, possibly older version of Guix, for reproducibility # across time. |