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

luke-jr · 2016-02-12T05:41:46Z

Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment

@theuni @Flowdalic @laanwj

I believe this addresses all the possible use cases correctly.

(This commit is based on branch-0.10, so should merge cleanly into 0.10, 0.11, 0.12, and master branches.)

… right one Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment

laanwj · 2016-04-14T15:44:21Z

@theuni can you take a look here?

theuni · 2016-04-15T23:32:32Z

To save others the digging:

This verifies that share/genbuild.sh exists at the git root. If it exists at a path that isn't at the git root, the check fails. For out-of-tree builds, that's fine because share/genbuild.sh would only exist in the source, not in the build dir.

However, this breaks for nested builds where the source is copied into a subdir, because share/genbuild.sh does end up existing there. We currently build that way for Gitian and Travis because out-of-tree builds don't work. Which is why the Gitian descriptors needed to be changed.

So.. ACK, but I would very much prefer to get the out-of-tree build changes merged first, and Gitian/Travis fixed up accordingly.

luke-jr · 2016-04-15T23:51:04Z

Well, specifically it makes sure the script itself (genbuild.sh) is part of the git repository it's about to get information from.

If the source is simply copied into a subdir, it shouldn't be using git (by default), so the "breaks" @theuni mentions is in fact a bug fix. The Gitian descriptor change tells git to basically use the git repo even for the differing source dir.

laanwj · 2016-04-16T05:49:47Z

So.. ACK, but I would very much prefer to get the out-of-tree build changes merged first,

Huray :)

laanwj · 2016-05-26T05:50:45Z

The out-of-tree build changes have been merged a while ago.

Anything left to do here?

sipa · 2016-06-01T19:00:11Z

@theuni So all good to merge now?

theuni · 2016-06-01T23:41:08Z

I just fixed up the rest of the out-of-tree stuff, and switched Travis to use it. After that, the changes here don't play nice with VPATH builds.

@luke-jr Mind having a look? I'll PR those changes now.

luke-jr · 2016-06-02T00:20:17Z

@theuni What is a "VPATH build"? If the changes here break it, then "VPATH builds" are already buggy and should probably be fixed before merging anyway...?

laanwj · 2016-06-17T08:42:53Z

#8113 went in.
What is the status of this now?

luke-jr · 2016-06-17T17:28:10Z

Current status is that #8133 (comment) suggests this PR doesn't fix the problem in practice, so I will need to review why.

laanwj · 2016-09-29T07:20:56Z

Closing for now as the changes apparently don't solve the problem. Ask me to reopen or open a new pull when there is progress on this.

maflcko · 2016-12-30T15:49:42Z

Reopen, as asked for by luke on irc.

luke-jr · 2016-12-30T17:29:38Z

Updated to actually fix the issue.

sipa

Concept ACK

sipa · 2017-04-09T14:39:31Z

contrib/gitian-descriptors/gitian-osx.yml

@@ -101,6 +101,7 @@ script: |
  export PATH=${WRAP_DIR}:${PATH}

  # Create the release tarball using (arbitrarily) the first host
+  export GIT_DIR="$PWD/.git"


Is this needed?

Since we build from the exported tarball, this is needed if we want the build system to use git to create the versioninfo. Otherwise, it will detect it is built from the tarball and not from git.

laanwj · 2017-05-02T13:10:14Z

@theuni can you please take a look at this again? Seems to be the oldest open PR now, we should either merge it or close it.

theuni · 2017-05-02T19:28:35Z

Since we build from the exported tarball, this is needed if we want the build system to use git to create the versioninfo. Otherwise, it will detect it is built from the tarball and not from git.

This seems backwards. Though since it's strictly an improvement, utACK for now.

I think we should strive to make sure that building from the tarball results in the correct version string with no need for git, but I'll work on that separately.

… actually the right one ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr) e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr) Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726

@luke-jr

4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr 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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

…tory is actually the right one ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr) e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr) Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726

@luke-jr

…ases 4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr Release version strings were broken in Gitian by bitcoin#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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

@luke-jr

…ases 4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr Release version strings were broken in Gitian by bitcoin#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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

@luke-jr

…ases 4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr Release version strings were broken in Gitian by bitcoin#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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

@luke-jr

…ases 4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr Release version strings were broken in Gitian by bitcoin#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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

…tory is actually the right one ed1fcdc Bugfix: Detect genbuild.sh in repo correctly (Luke Dashjr) e98e3dd Bugfix: Only use git for build info if the repository is actually the right one (Luke Dashjr) Tree-SHA512: 510d7ec8cfeff4e8e0c7ac53631eb32c7acaada7017e7f8cc2e6f60d86afe1cd131870582e01022f961c85a783a130bcb8fef971f8b110070c9c02afda020726

@luke-jr

…ases 4452829 gitian: quick hack to fix version string in releases (Cory Fields) Pull request description: Credit: @luke-jr Release version strings were broken in Gitian by bitcoin#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. Tree-SHA512: fa609a744c46306b0809f08fed6e96eff41b13e82f3e213711e4abef370558b64a68972f283a038330882cb6c40b32547fbb0f89b8058cc2c6025bff134473c3

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd Github-Pull: bitcoin#18902 Rebased-From: d9505bb

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

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

e98e3dd

… right one Also adds ability to disable check with BITCOIN_GENBUILD_NO_GIT=1 in the environment

luke-jr mentioned this pull request Feb 12, 2016

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

Closed

laanwj added the Build system label Feb 12, 2016

luke-jr mentioned this pull request Jun 5, 2016

build: Finish up out-of-tree changes #8133

Merged

Merge tag 'branch-0.13' into bugfix_gitdir

df63490

laanwj closed this Sep 29, 2016

Bugfix: Detect genbuild.sh in repo correctly

ed1fcdc

maflcko reopened this Dec 30, 2016

sipa reviewed Apr 9, 2017

View reviewed changes

laanwj merged commit ed1fcdc into bitcoin:master May 17, 2017

theuni mentioned this pull request Aug 19, 2017

gitian: quick hack to fix version string in releases #11097

Merged

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request May 6, 2020

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

ba23e5a

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request May 7, 2020

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

d9505bb

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

luke-jr mentioned this pull request May 7, 2020

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

Closed

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Oct 12, 2020

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

c8dc161

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 13, 2020

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

4ea29f2

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

luke-jr added a commit to luke-jr/bitcoin that referenced this pull request Nov 13, 2020

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

9b67f3f

… right one Original-Github-Pull: bitcoin#7522 Rebased-From: e98e3dd e98e3dd

bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021

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

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

Uh oh!

Conversation

luke-jr commented Feb 12, 2016

Uh oh!

laanwj commented Apr 14, 2016

Uh oh!

theuni commented Apr 15, 2016

Uh oh!

luke-jr commented Apr 15, 2016

Uh oh!

laanwj commented Apr 16, 2016

Uh oh!

laanwj commented May 26, 2016

Uh oh!

sipa commented Jun 1, 2016

Uh oh!

theuni commented Jun 1, 2016

Uh oh!

luke-jr commented Jun 2, 2016

Uh oh!

laanwj commented Jun 17, 2016

Uh oh!

luke-jr commented Jun 17, 2016

Uh oh!

laanwj commented Sep 29, 2016

Uh oh!

maflcko commented Dec 30, 2016

Uh oh!

luke-jr commented Dec 30, 2016

Uh oh!

sipa left a comment

Choose a reason for hiding this comment

Uh oh!

sipa Apr 9, 2017

Choose a reason for hiding this comment

Uh oh!

luke-jr Apr 9, 2017

Choose a reason for hiding this comment

Uh oh!

laanwj commented May 2, 2017

Uh oh!

theuni commented May 2, 2017

Uh oh!

Uh oh!