Fixed some times can not remove "$SUFFIX-dirty" on version number cor… #15521

pull rojarsmith wants to merge 1 commits into bitcoin:master from rojarsmith:master changing 1 files +1 −0

rojarsmith commented at 7:15 AM on March 4, 2019: contributor

Fixed some times can not remove "$SUFFIX-dirty" on version number correctly with git tag using Gitian.

Even you use git annotated tag encounter with such problem.
Fixed some times can not remove "$SUFFIX-dirty" on version number correctly with git tag using Gitian. 743b49ceaa
fanquake added the label Scripts and tools on Mar 4, 2019
MarcoFalke commented at 2:12 PM on March 4, 2019: member

What is git status when you encounter this problem?
in share/genbuild.sh:34 in 743b49ceaa
```
  30 | @@ -31,6 +31,7 @@ if [ "${BITCOIN_GENBUILD_NO_GIT}" != "1" -a -e "$(which git 2>/dev/null)" -a "$(
  31 |      # if latest commit is tagged and not dirty, then override using the tag name
  32 |      RAWDESC=$(git describe --abbrev=0 2>/dev/null)
  33 |      if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then
  34 | +        git checkout .
```
laanwj commented at 4:16 PM on March 4, 2019:

NACK it should definitely not mess with the files in the tree here, this will lose developer changes (genbuild is not only used by gitian, but every time obj/build.h is generated)
rojarsmith commented at 12:15 AM on March 5, 2019:

I run each line in genbuild.sh in ubuntu 18.04 console manually. The return value : git diff-index --quiet HEAD --

is 1 . Then "DESC=$RAWDESC" will not run.

git status

On branch master Your branch is up to date with 'origin/master'.

Changes not staged for commit: (use "git add <file>..." to update what will be committed) (use "git checkout -- <file>..." to discard changes in working directory)

modified: .gitattributes

... omit ...

modified: test/util/rpcauth-test.py

no changes added to commit (use "git add" and/or "git commit -a")
MarcoFalke commented at 3:09 PM on March 5, 2019:

So what does git diff say for all the modified files?

rojarsmith commented at 12:06 AM on March 6, 2019:

A lots of things like :

diff --git a/build-aux/m4/ax_boost_filesystem.m4 b/build-aux/m4/ax_boost_filesystem.m4 old mode 100644 new mode 100755

I use the Gitian with VMware that installing clean Ubuntu 18.04.

MarcoFalke commented at 12:15 AM on March 6, 2019:

Please let us know exact steps to reproduce from a fresh vanilla Ubuntu
MarcoFalke removed the label Scripts and tools on Mar 6, 2019
MarcoFalke added the label Questions and Help on Mar 6, 2019
MarcoFalke closed this on Mar 6, 2019
DrahtBot locked this on Dec 16, 2021

Contributors

Labels