Make genbuild.sh check for '.git' #7495

pull Flowdalic wants to merge 2 commits into bitcoin:master from Flowdalic:5902 changing 1 files +5 −3

Flowdalic commented at 8:35 AM on February 10, 2016: contributor

Addresses #5902. As mentioned in https://github.com/bitcoin/bitcoin/commit/c65cc8cde30dd34a81962fda51a754f1cc0bdde8 the initial check caused issues with gitian builds, therefore this introduces a check for a DONT_CHECK_FOR_DOT_GIT environment variable to disable it if the variable is set to an arbitrary value. I'm not sure if this approach is suitable for gitian. Does gitian use something other then .git as GITDIR? Or what makes gitian builds special? Maybe @theuni can comment on that.

Also some minor lint fixups found by shellcheck.

Check if '.git' exists in genbuild.sh

Was removed in c65cc8cde30dd34a81962fda51a754f1cc0bdde8 because of
gitian, thus this commit introduces a DONT_CHECK_FOR_DOT_GIT environment
variable, which can be used to disable the check.

Fixes #5902.

a76d15cfba

Fix genbuild.sh's shellcheck warnings 78c8425b04
luke-jr commented at 9:00 AM on February 10, 2016: member

c65cc8cde30dd34a81962fda51a754f1cc0bdde8 is simply re-introducing a regression, and should be reverted. A proper solution would be to check GIT_DIR environment var somehow.
Flowdalic commented at 10:08 AM on February 10, 2016: contributor
A proper solution would be to check GIT_DIR environment var somehow.

I was thinking in this direction, but I wasn't sure if this is caused by gitian setting GIT_DIR. Something like
```
BITCOIN_GIT_DIR=${GIT_DIR:-.git}
...
[ -d "$BITCOIN_GIT_DIR" -a ...
```
would then solve the issue.
luke-jr commented at 10:15 AM on February 10, 2016: member

The gitian descriptors probably do not set it, so that will need to be fixed too. Basically the way gitian is setup right now, there shouldn't be a commit id for it to embed.
laanwj added the label Build system on Feb 10, 2016
laanwj commented at 11:27 AM on February 10, 2016: member

There have been tons of changes to this script, every time fixing some issue but introducing another (probably in an unknown use-case by the author of the change). Let's first make a list of what we actually want it to do in what circumstances - e.g. a design that both @theuni and @luke-jr can agree on - before committing to anything.
luke-jr commented at 5:42 AM on February 12, 2016: member

See #7522
laanwj commented at 3:44 PM on April 14, 2016: member

Closing in favor of #7522
laanwj closed this on Apr 14, 2016
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels

Linked (view graph)

#5902 0.10 regression: genbuild.sh tries to mess with files outside non-git source root