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.
This commit is contained in:
parent
22e301a3d5
commit
4452829b10
3 changed files with 24 additions and 3 deletions
|
@ -132,7 +132,6 @@ script: |
|
||||||
export PATH=${WRAP_DIR}:${PATH}
|
export PATH=${WRAP_DIR}:${PATH}
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
export GIT_DIR="$PWD/.git"
|
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
|
@ -145,6 +144,9 @@ script: |
|
||||||
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version (prep)
|
||||||
|
make -C src obj/build.h
|
||||||
|
|
||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
# Extract the release tarball into a dir for each host and build
|
# Extract the release tarball into a dir for each host and build
|
||||||
for i in ${HOSTS}; do
|
for i in ${HOSTS}; do
|
||||||
|
@ -155,6 +157,11 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version
|
||||||
|
echo '#!/bin/true' >share/genbuild.sh
|
||||||
|
mkdir src/obj
|
||||||
|
cp ../src/obj/build.h src/obj/
|
||||||
|
|
||||||
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}"
|
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}"
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make ${MAKEOPTS} -C src check-security
|
make ${MAKEOPTS} -C src check-security
|
||||||
|
|
|
@ -101,7 +101,6 @@ script: |
|
||||||
export PATH=${WRAP_DIR}:${PATH}
|
export PATH=${WRAP_DIR}:${PATH}
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
export GIT_DIR="$PWD/.git"
|
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
|
@ -115,6 +114,9 @@ script: |
|
||||||
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
find bitcoin-* | sort | tar --no-recursion --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 -c -T - | gzip -9n > ../$SOURCEDIST
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version (prep)
|
||||||
|
make -C src obj/build.h
|
||||||
|
|
||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
# Extract the release tarball into a dir for each host and build
|
# Extract the release tarball into a dir for each host and build
|
||||||
for i in ${HOSTS}; do
|
for i in ${HOSTS}; do
|
||||||
|
@ -125,6 +127,11 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version
|
||||||
|
echo '#!/bin/true' >share/genbuild.sh
|
||||||
|
mkdir src/obj
|
||||||
|
cp ../src/obj/build.h src/obj/
|
||||||
|
|
||||||
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS}
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make install-strip DESTDIR=${INSTALLPATH}
|
make install-strip DESTDIR=${INSTALLPATH}
|
||||||
|
|
|
@ -116,7 +116,6 @@ script: |
|
||||||
export PATH=${WRAP_DIR}:${PATH}
|
export PATH=${WRAP_DIR}:${PATH}
|
||||||
|
|
||||||
# Create the release tarball using (arbitrarily) the first host
|
# Create the release tarball using (arbitrarily) the first host
|
||||||
export GIT_DIR="$PWD/.git"
|
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
CONFIG_SITE=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`/share/config.site ./configure --prefix=/
|
||||||
make dist
|
make dist
|
||||||
|
@ -132,6 +131,9 @@ script: |
|
||||||
cp ../$SOURCEDIST $OUTDIR/src
|
cp ../$SOURCEDIST $OUTDIR/src
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version (prep)
|
||||||
|
make -C src obj/build.h
|
||||||
|
|
||||||
ORIGPATH="$PATH"
|
ORIGPATH="$PATH"
|
||||||
# Extract the release tarball into a dir for each host and build
|
# Extract the release tarball into a dir for each host and build
|
||||||
for i in ${HOSTS}; do
|
for i in ${HOSTS}; do
|
||||||
|
@ -142,6 +144,11 @@ script: |
|
||||||
mkdir -p ${INSTALLPATH}
|
mkdir -p ${INSTALLPATH}
|
||||||
tar --strip-components=1 -xf ../$SOURCEDIST
|
tar --strip-components=1 -xf ../$SOURCEDIST
|
||||||
|
|
||||||
|
# Workaround for tarball not building with the bare tag version
|
||||||
|
echo '#!/bin/true' >share/genbuild.sh
|
||||||
|
mkdir src/obj
|
||||||
|
cp ../src/obj/build.h src/obj/
|
||||||
|
|
||||||
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
|
CONFIG_SITE=${BASEPREFIX}/${i}/share/config.site ./configure --prefix=/ --disable-ccache --disable-maintainer-mode --disable-dependency-tracking ${CONFIGFLAGS} CFLAGS="${HOST_CFLAGS}" CXXFLAGS="${HOST_CXXFLAGS}"
|
||||||
make ${MAKEOPTS}
|
make ${MAKEOPTS}
|
||||||
make ${MAKEOPTS} -C src check-security
|
make ${MAKEOPTS} -C src check-security
|
||||||
|
|
Loading…
Reference in a new issue