[Mesa-dev] [PATCH] autotools: include git_sha1.h in dist tarball

[Emil Velikov]

On Thu, 23 Aug 2018 at 18:31, Eric Anholt <eric at anholt.net> wrote:
>
> "Juan A. Suarez Romero" <jasuarez at igalia.com> writes:
>
> > On Mon, 2018-08-20 at 21:32 +0100, Eric Engestrom wrote:
> >> On Monday, 2018-08-20 14:23:28 +0000, Juan A. Suarez Romero wrote:
> >> > This fixes `make distcheck`.
> >> >
> >> > Fixes: 471f708ed6 ("git_sha1: simplify logic")
> >> > CC: Eric Engestrom <eric.engestrom at intel.com>
> >> > ---
> >> >  src/Makefile.am | 2 +-
> >> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >> >
> >> > diff --git a/src/Makefile.am b/src/Makefile.am
> >> > index 396865cbe55..412510f435b 100644
> >> > --- a/src/Makefile.am
> >> > +++ b/src/Makefile.am
> >> > @@ -26,7 +26,7 @@ git_sha1.h:
> >> >
> >> >  BUILT_SOURCES = git_sha1.h
> >> >  CLEANFILES = $(BUILT_SOURCES)
> >> > -EXTRA_DIST = git_sha1.h.in meson.build
> >> > +EXTRA_DIST = git_sha1.h meson.build
> >>
> >> Hmm, I need to double-check (tomorrow), but this feels wrong to me:
> >> shouldn't we drop it from the EXTRA_DIST, so that it gets regenerated
> >> on
> >> the system using the release tarball, instead of shipping the one
> >> built
> >> from git?
> >>
> >
> > Hmm. Good question. I thought this file was generated using git
> > information, and as git is not in the distributed tarball, we should
> > distribute the generated file. There are other cases where the dist
> > tarball contains generated files, instead of regenerating them when
> > building the tarball.
> >
> > In any case, it would be good if you can double check it. I already
> > pushed this commit (as this fixes `make distcheck`) but removing the
> > file from EXTRA_DIST is straight forward.
>
> If we're building outside of a git tree (such as a tarball) I don't
> think we should include git commit IDs in our version strings, as there
> are likely random other patches on top of the tarball and thus this will
> give the mistaken impression that git_sha1.h represents the tree that
> was built.

Indeed,. Eric Engestrom addressed that with 6ff1c479968, shortly after
this patch was pushed.

-Emil