diff mbox

[infiniband-diags] Fix the gen_chlog.sh script to support builds in a separate directory

Message ID 20170614104824.21599-1-knut.omang@oracle.com (mailing list archive)
State Rejected
Delegated to: Ira Weiny
Headers show

Commit Message

Knut Omang June 14, 2017, 10:48 a.m. UTC
Configuring and building in a separate directory breaks
because gen_chlog.sh assumes it runs from the git tree.
Instead of making this assumption, rather assume the more
generic, that the gen_chlog.sh script itself is located
in the top sourcedir.

With this fix configuring and building in a separate
tree from the source tree works.

Signed-off-by: Knut Omang <knut.omang@oracle.com>
---
 gen_chlog.sh | 2 ++
 1 file changed, 2 insertions(+)

Comments

Knut Omang June 16, 2017, 12:01 p.m. UTC | #1
Never mind - after some head scratching I realized my git remote reference 
had become obsolete since the last time I pulled it.

This patch was against the obsolete (but still existing)
git://git.openfabrics.org/~iraweiny/infiniband-diags.git

not the current

https://github.com/linux-rdma/infiniband-diags

Thanks,
Knut

On Wed, 2017-06-14 at 12:48 +0200, Knut Omang wrote:
> Configuring and building in a separate directory breaks
> because gen_chlog.sh assumes it runs from the git tree.
> Instead of making this assumption, rather assume the more
> generic, that the gen_chlog.sh script itself is located
> in the top sourcedir.
> 
> With this fix configuring and building in a separate
> tree from the source tree works.
> 
> Signed-off-by: Knut Omang <knut.omang@oracle.com>
> ---
>  gen_chlog.sh | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/gen_chlog.sh b/gen_chlog.sh
> index 34dfa24..59a9e1f 100755
> --- a/gen_chlog.sh
> +++ b/gen_chlog.sh
> @@ -10,6 +10,8 @@ if [ "$1" = "--spec" ] ; then
>  	spec_format=1
>  fi
>  
> +cd `dirname $0`
> +
>  GIT_DIR=`git rev-parse --git-dir 2>/dev/null`
>  
>  test -z "$GIT_DIR" && usage
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Ira Weiny June 19, 2017, 11:46 p.m. UTC | #2
> Never mind - after some head scratching I realized my git remote reference had

> become obsolete since the last time I pulled it.

> 

> This patch was against the obsolete (but still existing)

> git://git.openfabrics.org/~iraweiny/infiniband-diags.git

> 

> not the current

> 

> https://github.com/linux-rdma/infiniband-diags


Correct.  I removed that functionality.

Thanks,
Ira

> 

> Thanks,

> Knut

> 

> On Wed, 2017-06-14 at 12:48 +0200, Knut Omang wrote:

> > Configuring and building in a separate directory breaks because

> > gen_chlog.sh assumes it runs from the git tree.

> > Instead of making this assumption, rather assume the more generic,

> > that the gen_chlog.sh script itself is located in the top sourcedir.

> >

> > With this fix configuring and building in a separate tree from the

> > source tree works.

> >

> > Signed-off-by: Knut Omang <knut.omang@oracle.com>

> > ---

> >  gen_chlog.sh | 2 ++

> >  1 file changed, 2 insertions(+)

> >

> > diff --git a/gen_chlog.sh b/gen_chlog.sh index 34dfa24..59a9e1f 100755

> > --- a/gen_chlog.sh

> > +++ b/gen_chlog.sh

> > @@ -10,6 +10,8 @@ if [ "$1" = "--spec" ] ; then

> >  	spec_format=1

> >  fi

> >

> > +cd `dirname $0`

> > +

> >  GIT_DIR=`git rev-parse --git-dir 2>/dev/null`

> >

> >  test -z "$GIT_DIR" && usage
diff mbox

Patch

diff --git a/gen_chlog.sh b/gen_chlog.sh
index 34dfa24..59a9e1f 100755
--- a/gen_chlog.sh
+++ b/gen_chlog.sh
@@ -10,6 +10,8 @@  if [ "$1" = "--spec" ] ; then
 	spec_format=1
 fi
 
+cd `dirname $0`
+
 GIT_DIR=`git rev-parse --git-dir 2>/dev/null`
 
 test -z "$GIT_DIR" && usage