LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Bugfix: Only use git for build info if the repository is actually the right one

Browse source 
Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment
This commit is contained in:
Luke Dashjr 2016-02-12 05:36:55 +00:00
parent 41cced2106
commit e98e3dde6a
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/gitian-descriptors/gitian-linux.yml
View file

@ -70,6 +70,7 @@ script: |
done done
# 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
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist make dist

1
contrib/gitian-descriptors/gitian-osx.yml
View file

@ -80,6 +80,7 @@ script: |
done done
# 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
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist make dist

1
contrib/gitian-descriptors/gitian-win.yml
View file

@ -73,6 +73,7 @@ script: |
done done
# 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
./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'` ./configure --prefix=${BASEPREFIX}/`echo "${HOSTS}" | awk '{print $1;}'`
make dist make dist

2
share/genbuild.sh
View file

@ -16,7 +16,7 @@ fi
DESC="" DESC=""
SUFFIX="" SUFFIX=""
LAST_COMMIT_DATE="" LAST_COMMIT_DATE=""
if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]; then if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" -a "$(git status --porcelain -u no --ignored "$0" | cut -b1)" != "?" ]; then
# clean 'dirty' status of touched files that haven't been modified # clean 'dirty' status of touched files that haven't been modified
git diff >/dev/null 2>/dev/null git diff >/dev/null 2>/dev/null