[openib-general] RE: [PATCH] osm: Adding revision empty file

[Hal Rosenstock]

On Thu, 2006-03-02 at 09:23, Vladimir Sokolovsky wrote:
>  This worked for me too,
> Thanks

Thanks. Applied (to both trunk and 1.0 branch).

-- Hal

> Regards,
> Vladimir
> 
> -----Original Message-----
> From: Hal Rosenstock [mailto:halr at voltaire.com] 
> Sent: Thursday, March 02, 2006 2:45 PM
> To: Sasha Khapyorsky
> Cc: Ofer Gigi; Vladimir Sokolovsky; OPENIB
> Subject: Re: [openib-general] RE: [PATCH] osm: Adding revision empty
> file
> 
> On Wed, 2006-03-01 at 11:16, Sasha Khapyorsky wrote:
> > On 10:44 Wed 01 Mar     , Hal Rosenstock wrote:
> > > On Wed, 2006-03-01 at 10:43, Sasha Khapyorsky wrote:
> > > > On 16:50 Wed 01 Mar     , Ofer Gigi wrote:
> > > > >
> > > > > To reproduce:
> > > > > 
> > > > > 	cd src/userspace/management/osm
> > > > > 	./autogen.sh
> > > > > 	./configure --disable-libcheck
> > > > > 	make dist
> > > > 
> > > > Hal, Ofer, do we need distributible osm_svn_revision.h? If not we 
> > > > may just remove it from dist and dep lists. If yes then probably 
> > > > we may move osm_svn_revision.h generation to include/Makefile.am.
> > > > 
> > > > To add autogenerated file under source control is not good idea.
> > > 
> > > That was what caused the problem in the first place.
> > 
> > Yes.
> > 
> > After more thinking: there is no big reason to make osm_svn_revision.h
> 
> > distributible - this will be recreated in build time anyway. Right?
> > 
> > Ofer, Vladimir, could you try this:
> 
> This worked for me too. Ofer, Vlad ?
> 
> -- Hal
> 
> > diff --git a/osm/include/Makefile.am b/osm/include/Makefile.am index 
> > 68e60bf..e1f7070 100644
> > --- a/osm/include/Makefile.am
> > +++ b/osm/include/Makefile.am
> > @@ -4,7 +4,6 @@ nobase_pkginclude_HEADERS = iba/ib_types
> >  
> >  EXTRA_DIST = \
> >  	$(srcdir)/opensm/osm_version.h \
> > -	$(srcdir)/opensm/osm_svn_revision.h \
> >  	$(srcdir)/opensm/osm_sa_portinfo_record_ctrl.h \
> >  	$(srcdir)/opensm/osm_sa_guidinfo_record_ctrl.h \
> >  	$(srcdir)/opensm/osm_sa_path_record.h \
> > 
> > 
> > Just to be sure, I checked it with:
> > 
> >  ./autogen.sh && ./configure --disable-libcheck && make dist && make
> > 
> > but my dev tree may be dirty.
> > 
> > Sasha.