diff mbox series

configure.ac: Resolve GIT_SHA even if repository is a submodule

Message ID 20210419182832.577010-1-niklas.soderlund@ragnatech.se (mailing list archive)
State New
Headers show
Series configure.ac: Resolve GIT_SHA even if repository is a submodule | expand

Commit Message

Niklas Söderlund April 19, 2021, 6:28 p.m. UTC
If the v4l-utils repository is a git submodule the $(top_srcdir)/.git is
a file and not a directory. Update the shell check to allow the test to
pass in both cases.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
---
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Hans Verkuil April 19, 2021, 9:10 p.m. UTC | #1
On 19/04/2021 20:28, Niklas Söderlund wrote:
> If the v4l-utils repository is a git submodule the $(top_srcdir)/.git is
> a file and not a directory. Update the shell check to allow the test to
> pass in both cases.
> 
> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> ---
>  configure.ac | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/configure.ac b/configure.ac
> index f144a50d034fbda0..4ac4195cd6e4747e 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -588,7 +588,7 @@ fi
>  CPPFLAGS="-I\$(top_srcdir)/lib/include -Wall -Wpointer-arith -D_GNU_SOURCE $CPPFLAGS"
>  
>  # Obtain git SHA of HEAD
> -AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -d \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
> +AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -e \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
>  
>  # Obtain git commit count of HEAD
>  AC_SUBST(GIT_COMMIT_CNT, ["-DGIT_COMMIT_CNT=\$(shell if test -d \$(top_srcdir)/.git ; then printf '-'; git -C \$(top_srcdir) rev-list --count HEAD ; fi)"])

Isn't the same change needed here and in GIT_COMMIT_DATE as well?

Regards,

	Hans

>
Niklas Söderlund April 19, 2021, 9:22 p.m. UTC | #2
Hi Hans,

On 2021-04-19 23:10:37 +0200, Hans Verkuil wrote:
> On 19/04/2021 20:28, Niklas Söderlund wrote:
> > If the v4l-utils repository is a git submodule the $(top_srcdir)/.git is
> > a file and not a directory. Update the shell check to allow the test to
> > pass in both cases.
> > 
> > Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
> > ---
> >  configure.ac | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index f144a50d034fbda0..4ac4195cd6e4747e 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -588,7 +588,7 @@ fi
> >  CPPFLAGS="-I\$(top_srcdir)/lib/include -Wall -Wpointer-arith -D_GNU_SOURCE $CPPFLAGS"
> >  
> >  # Obtain git SHA of HEAD
> > -AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -d \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
> > +AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -e \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
> >  
> >  # Obtain git commit count of HEAD
> >  AC_SUBST(GIT_COMMIT_CNT, ["-DGIT_COMMIT_CNT=\$(shell if test -d \$(top_srcdir)/.git ; then printf '-'; git -C \$(top_srcdir) rev-list --count HEAD ; fi)"])
> 
> Isn't the same change needed here and in GIT_COMMIT_DATE as well?

Wops, you are correct. I noticed the problem in an older branch where 
version.h was generated in different utilities and this is a bad 
conflict fix of that.

Do you want me to resend?

> 
> Regards,
> 
> 	Hans
> 
> > 
>
Hans Verkuil April 19, 2021, 9:30 p.m. UTC | #3
On 19/04/2021 23:22, Niklas Söderlund wrote:
> Hi Hans,
> 
> On 2021-04-19 23:10:37 +0200, Hans Verkuil wrote:
>> On 19/04/2021 20:28, Niklas Söderlund wrote:
>>> If the v4l-utils repository is a git submodule the $(top_srcdir)/.git is
>>> a file and not a directory. Update the shell check to allow the test to
>>> pass in both cases.
>>>
>>> Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
>>> ---
>>>  configure.ac | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/configure.ac b/configure.ac
>>> index f144a50d034fbda0..4ac4195cd6e4747e 100644
>>> --- a/configure.ac
>>> +++ b/configure.ac
>>> @@ -588,7 +588,7 @@ fi
>>>  CPPFLAGS="-I\$(top_srcdir)/lib/include -Wall -Wpointer-arith -D_GNU_SOURCE $CPPFLAGS"
>>>  
>>>  # Obtain git SHA of HEAD
>>> -AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -d \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
>>> +AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -e \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
>>>  
>>>  # Obtain git commit count of HEAD
>>>  AC_SUBST(GIT_COMMIT_CNT, ["-DGIT_COMMIT_CNT=\$(shell if test -d \$(top_srcdir)/.git ; then printf '-'; git -C \$(top_srcdir) rev-list --count HEAD ; fi)"])
>>
>> Isn't the same change needed here and in GIT_COMMIT_DATE as well?
> 
> Wops, you are correct. I noticed the problem in an older branch where 
> version.h was generated in different utilities and this is a bad 
> conflict fix of that.
> 
> Do you want me to resend?

Yes please!

Thanks,

	Hans
diff mbox series

Patch

diff --git a/configure.ac b/configure.ac
index f144a50d034fbda0..4ac4195cd6e4747e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,7 +588,7 @@  fi
 CPPFLAGS="-I\$(top_srcdir)/lib/include -Wall -Wpointer-arith -D_GNU_SOURCE $CPPFLAGS"
 
 # Obtain git SHA of HEAD
-AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -d \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
+AC_SUBST(GIT_SHA, ["-DGIT_SHA=\$(shell if test -e \$(top_srcdir)/.git ; then git -C \$(top_srcdir) rev-parse --short=12 HEAD ; fi)"])
 
 # Obtain git commit count of HEAD
 AC_SUBST(GIT_COMMIT_CNT, ["-DGIT_COMMIT_CNT=\$(shell if test -d \$(top_srcdir)/.git ; then printf '-'; git -C \$(top_srcdir) rev-list --count HEAD ; fi)"])