Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
build: Include tag name in release tarball for build.h
Github-Pull: bitcoin#18902
Rebased-From: 83ecd1b
  • Loading branch information
luke-jr committed May 7, 2020
1 parent c174286 commit 117c280
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions contrib/gitian-descriptors/make_release_tarball
Expand Up @@ -11,6 +11,11 @@ GIT_ARCHIVE="$1"
. "`dirname "$0"`/assign_DISTNAME"

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
Expand Down
4 changes: 3 additions & 1 deletion share/genbuild.sh
Expand Up @@ -45,7 +45,9 @@ if [ -n "$DESC" ]; then
elif [ -n "$SUFFIX" ]; then
NEWINFO="#define BUILD_SUFFIX $SUFFIX"
else
NEWINFO="// No build information available"
# NOTE: The NEWINFO line below this comment gets replaced by a string-match in contrib/gitian-descriptors/make_release_tarball
# If changing it, update the script too!
NEWINFO='// No build information available'
fi

# only update build.h if necessary
Expand Down

0 comments on commit 117c280

Please sign in to comment.