Re: When will bsnmp stop breaking -current builds

On Thu, Mar 09, 2006 at 02:56:33PM +0200, Giorgos Keramidas wrote:
> On 2006-03-09 10:15, Ruslan Ermilov <ru_at_freebsd.org> wrote:
> > > %%%
> > > Index: Makefile.inc1
> > > ===================================================================
> > > --- Makefile.inc1	(.../branches/ncvs/src/Makefile.inc1)	(revision 42)
> > > +++ Makefile.inc1	(.../trunk/src/Makefile.inc1)	(revision 42)
> > > _at__at_ -824,6 +824,10 _at__at_
> > >  _pwd_mkdb=	usr.sbin/pwd_mkdb
> > >  .endif
> > >
> > > +.if ${BOOTSTRAPPING} < 700014
> > > +_gensnmptree=	usr.sbin/bsnmpd/gensnmptree
> > > +.endif
> > > +
> > >  bootstrap-tools:
> > >  .for _tool in \
> > >      ${_strfile} \
> > > _at__at_ -839,6 +843,7 _at__at_
> > >      usr.bin/rpcgen \
> > >      usr.bin/xinstall \
> > >      usr.sbin/config \
> > > +    ${_gensnmptree} \
> > >      ${_crunchgen} \
> > >      ${_pwd_mkdb}
> > >  	${_+_}_at_${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
> > > %%%
> >
> > Yes, exactly this.
> 
> On 2006-03-09 09:24, Harti Brandt <hartmut.brandt_at_dlr.de> wrote:
> >
> > Looks fine to me, if it fixes the problem.
> >
> > harti
> 
> Thanks, committed.
> 
> Do you think we also need to merge this to RELENG_6 and RELENG_5 some
> time later, to allow upgrades from those branches to the HEAD of
> CURRENT?
> 
No, such upgrades use HEAD sources, including fixed Makefile.inc1.
Unless a similar problem existed in RELENG_[56] of course...


Cheers,
-- 
Ruslan Ermilov
ru_at_FreeBSD.org
FreeBSD committer