Date: Thu, 9 Mar 2006 15:28:39 +0200 From: Ruslan Ermilov <ru@FreeBSD.ORG> To: Giorgos Keramidas <keramida@ceid.upatras.gr> Cc: deischen@FreeBSD.ORG, des@des.no, Harti Brandt <harti@FreeBSD.ORG>, current@FreeBSD.ORG, "M. Warner Losh" <imp@bsdimp.com> Subject: Re: When will bsnmp stop breaking -current builds Message-ID: <20060309132839.GA46241@ip.net.ua> In-Reply-To: <20060309125632.GA1677@flame.pc> References: <20060308200214.GA63755@flame.pc> <20060309092303.W10582@beagle.kn.op.dlr.de> <20060308085714.L10582@beagle.kn.op.dlr.de> <86bqwh59gn.fsf@xps.des.no> <20060308152413.GA43764@flame.pc> <20060308.115539.98861830.imp@bsdimp.com> <20060308192657.GA54826@ip.net.ua> <20060308200214.GA63755@flame.pc> <20060309081544.GD54826@ip.net.ua> <20060309125632.GA1677@flame.pc>
next in thread | previous in thread | raw e-mail | index | archive | help
--HcAYCG3uE/tztfnV
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On Thu, Mar 09, 2006 at 02:56:33PM +0200, Giorgos Keramidas wrote:
> On 2006-03-09 10:15, Ruslan Ermilov <ru@freebsd.org> wrote:
> > > %%%
> > > Index: Makefile.inc1
> > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> > > --- Makefile.inc1 (.../branches/ncvs/src/Makefile.inc1) (revision 42)
> > > +++ Makefile.inc1 (.../trunk/src/Makefile.inc1) (revision 42)
> > > @@ -824,6 +824,10 @@
> > > _pwd_mkdb=3D usr.sbin/pwd_mkdb
> > > .endif
> > >
> > > +.if ${BOOTSTRAPPING} < 700014
> > > +_gensnmptree=3D usr.sbin/bsnmpd/gensnmptree
> > > +.endif
> > > +
> > > bootstrap-tools:
> > > .for _tool in \
> > > ${_strfile} \
> > > @@ -839,6 +843,7 @@
> > > usr.bin/rpcgen \
> > > usr.bin/xinstall \
> > > usr.sbin/config \
> > > + ${_gensnmptree} \
> > > ${_crunchgen} \
> > > ${_pwd_mkdb}
> > > ${_+_}@${ECHODIR} "=3D=3D=3D> ${_tool} (obj,depend,all,install)"; \
> > > %%%
> >
> > Yes, exactly this.
>=20
> On 2006-03-09 09:24, Harti Brandt <hartmut.brandt@dlr.de> wrote:
> >
> > Looks fine to me, if it fixes the problem.
> >
> > harti
>=20
> Thanks, committed.
>=20
> 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?
>=20
No, such upgrades use HEAD sources, including fixed Makefile.inc1.
Unless a similar problem existed in RELENG_[56] of course...
Cheers,
--=20
Ruslan Ermilov
ru@FreeBSD.org
FreeBSD committer
--HcAYCG3uE/tztfnV
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (FreeBSD)
iD8DBQFEEC2HqRfpzJluFF4RArKwAJ9VdiuVUYoiioTjm1Rv7WIagsjRpACeMTSL
q996NPyR79wkcZNc4Pi9T2A=
=iG6N
-----END PGP SIGNATURE-----
--HcAYCG3uE/tztfnV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060309132839.GA46241>