Skip to content

Commit 4452829

Browse files
committed
gitian: quick hack to fix version string in releases
Release version strings were broken in Gitian by 7522. This is a minimal fix suitable for 0.15. After this, we should fix up version handling for good so that gitian packages the correct string in the release tarball, so that git is not required to get the tag name.
1 parent 22e301a commit 4452829

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ script: |
132132
export PATH=${WRAP_DIR}:${PATH}
133133
134134
# Create the release tarball using (arbitrarily) the first host
135-
export GIT_DIR="$PWD/.git"
136135
./autogen.sh
137136
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
138137
make dist
@@ -145,6 +144,9 @@ script: |
145144
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
146145
popd
147146
147+
# Workaround for tarball not building with the bare tag version (prep)
148+
make -C src obj/build.h
149+
148150
ORIGPATH="$PATH"
149151
# Extract the release tarball into a dir for each host and build
150152
for i in ${HOSTS}; do
@@ -155,6 +157,11 @@ script: |
155157
mkdir -p ${INSTALLPATH}
156158
tar --strip-components=1 -xf ../$SOURCEDIST
157159
160+
# Workaround for tarball not building with the bare tag version
161+
echo '#!/bin/true' >share/genbuild.sh
162+
mkdir src/obj
163+
cp ../src/obj/build.h src/obj/
164+
158165
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}"
159166
make ${MAKEOPTS}
160167
make ${MAKEOPTS} -C src check-security

contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ script: |
101101
export PATH=${WRAP_DIR}:${PATH}
102102
103103
# Create the release tarball using (arbitrarily) the first host
104-
export GIT_DIR="$PWD/.git"
105104
./autogen.sh
106105
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
107106
make dist
@@ -115,6 +114,9 @@ script: |
115114
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
116115
popd
117116
117+
# Workaround for tarball not building with the bare tag version (prep)
118+
make -C src obj/build.h
119+
118120
ORIGPATH="$PATH"
119121
# Extract the release tarball into a dir for each host and build
120122
for i in ${HOSTS}; do
@@ -125,6 +127,11 @@ script: |
125127
mkdir -p ${INSTALLPATH}
126128
tar --strip-components=1 -xf ../$SOURCEDIST
127129
130+
# Workaround for tarball not building with the bare tag version
131+
echo '#!/bin/true' >share/genbuild.sh
132+
mkdir src/obj
133+
cp ../src/obj/build.h src/obj/
134+
128135
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
129136
make ${MAKEOPTS}
130137
make install-strip DESTDIR=${INSTALLPATH}

contrib/gitian-descriptors/gitian-win.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ script: |
116116
export PATH=${WRAP_DIR}:${PATH}
117117
118118
# Create the release tarball using (arbitrarily) the first host
119-
export GIT_DIR="$PWD/.git"
120119
./autogen.sh
121120
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
122121
make dist
@@ -132,6 +131,9 @@ script: |
132131
cp ../$SOURCEDIST $OUTDIR/src
133132
popd
134133
134+
# Workaround for tarball not building with the bare tag version (prep)
135+
make -C src obj/build.h
136+
135137
ORIGPATH="$PATH"
136138
# Extract the release tarball into a dir for each host and build
137139
for i in ${HOSTS}; do
@@ -142,6 +144,11 @@ script: |
142144
mkdir -p ${INSTALLPATH}
143145
tar --strip-components=1 -xf ../$SOURCEDIST
144146
147+
# Workaround for tarball not building with the bare tag version
148+
echo '#!/bin/true' >share/genbuild.sh
149+
mkdir src/obj
150+
cp ../src/obj/build.h src/obj/
151+
145152
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
146153
make ${MAKEOPTS}
147154
make ${MAKEOPTS} -C src check-security

0 commit comments

Comments
 (0)